Subversion Repositories SmartDukaan

Rev

Rev 27918 | Rev 29610 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 27918 Rev 28019
Line 23... Line 23...
23 
    @Id
 23 
    @Id
24 
    @Column(name = "id")
 24 
    @Column(name = "id")
25 
    @GeneratedValue(strategy = GenerationType.IDENTITY)
 25 
    @GeneratedValue(strategy = GenerationType.IDENTITY)
26 
    private int id;
 26 
    private int id;
27 
 
 27 
 
28 
    @Column(name = "brand_share_percentage", nullable = false, columnDefinition = "TINYINT(1)")
 28 
    @Column(name = "brand_share_percentage", nullable = false)
29 
    private double brandSharePercentage;
 29 
    private double brandSharePercentage;
30 
 
 30 
 
- 
 
 31
- 
 
 32
31 
 
 33 
 
32 
    @Column(name = "name")
 34 
    @Column(name = "name")
33 
    private String name;
 35 
    private String name;
34 
 
 36 
 
35 
    @Column(name = "offer_notes")
 37 
    @Column(name = "offer_notes")
Line 40... Line 42...
40 
 
 42 
 
41 
    @Column(name = "scheme_type")
 43 
    @Column(name = "scheme_type")
42 
    @Enumerated(EnumType.STRING)
 44 
    @Enumerated(EnumType.STRING)
43 
    private OfferSchemeType schemeType;
 45 
    private OfferSchemeType schemeType;
44 
 
 46 
 
- 
 
 47
- 
 
 48 
    @Column(name = "incremental_target", nullable = false)
- 
 
 49 
    private boolean incrementalTarget;
- 
 
 50 
 
45 
    @Column(name = "sellin_percentage")
 51 
    @Column(name = "sellin_percentage")
46 
    private double sellinPercentage;
 52 
    private double sellinPercentage;
47 
 
 53 
 
48 
    @Column(name = "target_type")
 54 
    @Column(name = "target_type")
49 
    @Enumerated(EnumType.STRING)
 55 
    @Enumerated(EnumType.STRING)
Line 87... Line 93...
87 
	}
 93 
	}
88 
 
 94 
 
89 
	@Override
 95 
	@Override
90 
	public String toString() {
 96 
	public String toString() {
91 
		return "Offer [id=" + id + ", brandSharePercentage=" + brandSharePercentage + ", name=" + name + ", offerNotes="
 97 
		return "Offer [id=" + id + ", brandSharePercentage=" + brandSharePercentage + ", name=" + name + ", offerNotes="
92 
				+ offerNotes + ", terms=" + terms + ", schemeType=" + schemeType + ", sellinPercentage="
 98 
				+ offerNotes + ", terms=" + terms + ", schemeType=" + schemeType + ", incrementalTarget="
- 
 
 99 
				+ incrementalTarget + ", sellinPercentage=" + sellinPercentage + ", targetType=" + targetType
93 
				+ sellinPercentage + ", targetType=" + targetType + ", payoutType=" + payoutType + ", activationBrands="
 100 
				+ ", payoutType=" + payoutType + ", activationBrands=" + activationBrands + ", itemCriteria="
94 
				+ activationBrands + ", itemCriteria=" + itemCriteria + ", partnerCriteria=" + partnerCriteria
 101 
				+ itemCriteria + ", partnerCriteria=" + partnerCriteria + ", startDate=" + startDate + ", endDate="
95 
				+ ", startDate=" + startDate + ", endDate=" + endDate + ", createdTimestamp=" + createdTimestamp
 102 
				+ endDate + ", createdTimestamp=" + createdTimestamp + ", active=" + active + ", itemCriteriaString="
96 
				+ ", active=" + active + ", itemCriteriaString=" + itemCriteriaString + "]";
 103 
				+ itemCriteriaString + "]";
- 
 
 104 
	}
- 
 
 105
- 
 
 106
- 
 
 107 
 
- 
 
 108 
	public boolean isIncrementalTarget() {
- 
 
 109 
		return incrementalTarget;
- 
 
 110 
	}
- 
 
 111 
 
- 
 
 112 
	public void setIncrementalTarget(boolean incrementalTarget) {
- 
 
 113 
		this.incrementalTarget = incrementalTarget;
97 
	}
 114 
	}
98 
 
 115 
 
99 
	@Override
 116 
	@Override
100 
	public boolean equals(Object obj) {
 117 
	public boolean equals(Object obj) {
101 
		if (this == obj)
 118 
		if (this == obj)
Line 124... Line 141...
124 
				return false;
 141 
				return false;
125 
		} else if (!endDate.equals(other.endDate))
 142 
		} else if (!endDate.equals(other.endDate))
126 
			return false;
 143 
			return false;
127 
		if (id != other.id)
 144 
		if (id != other.id)
128 
			return false;
 145 
			return false;
- 
 
 146 
		if (incrementalTarget != other.incrementalTarget)
- 
 
 147 
			return false;
129 
		if (itemCriteria == null) {
 148 
		if (itemCriteria == null) {
130 
			if (other.itemCriteria != null)
 149 
			if (other.itemCriteria != null)
131 
				return false;
 150 
				return false;
132 
		} else if (!itemCriteria.equals(other.itemCriteria))
 151 
		} else if (!itemCriteria.equals(other.itemCriteria))
133 
			return false;
 152 
			return false;
Line 182... Line 201...
182 
		temp = Double.doubleToLongBits(brandSharePercentage);
 201 
		temp = Double.doubleToLongBits(brandSharePercentage);
183 
		result = prime * result + (int) (temp ^ (temp >>> 32));
 202 
		result = prime * result + (int) (temp ^ (temp >>> 32));
184 
		result = prime * result + ((createdTimestamp == null) ? 0 : createdTimestamp.hashCode());
 203 
		result = prime * result + ((createdTimestamp == null) ? 0 : createdTimestamp.hashCode());
185 
		result = prime * result + ((endDate == null) ? 0 : endDate.hashCode());
 204 
		result = prime * result + ((endDate == null) ? 0 : endDate.hashCode());
186 
		result = prime * result + id;
 205 
		result = prime * result + id;
- 
 
 206 
		result = prime * result + (incrementalTarget ? 1231 : 1237);
187 
		result = prime * result + ((itemCriteria == null) ? 0 : itemCriteria.hashCode());
 207 
		result = prime * result + ((itemCriteria == null) ? 0 : itemCriteria.hashCode());
188 
		result = prime * result + ((itemCriteriaString == null) ? 0 : itemCriteriaString.hashCode());
 208 
		result = prime * result + ((itemCriteriaString == null) ? 0 : itemCriteriaString.hashCode());
189 
		result = prime * result + ((name == null) ? 0 : name.hashCode());
 209 
		result = prime * result + ((name == null) ? 0 : name.hashCode());
190 
		result = prime * result + ((offerNotes == null) ? 0 : offerNotes.hashCode());
 210 
		result = prime * result + ((offerNotes == null) ? 0 : offerNotes.hashCode());
191 
		result = prime * result + ((partnerCriteria == null) ? 0 : partnerCriteria.hashCode());
 211 
		result = prime * result + ((partnerCriteria == null) ? 0 : partnerCriteria.hashCode());