Subversion Repositories SmartDukaan

Rev

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

Rev 28344 Rev 28352
Line 47... Line 47...
47
	private int orderId;
47
	private int orderId;
48
 
48
 
49
	@Column(name = "item_id")
49
	@Column(name = "item_id")
50
	private int itemId;
50
	private int itemId;
51
 
51
 
-
 
52
	@Column(name = "remark")
-
 
53
	private String remark;
-
 
54
 
-
 
55
	public String getRemark() {
-
 
56
		return remark;
-
 
57
	}
-
 
58
 
-
 
59
	public void setRemark(String remark) {
-
 
60
		this.remark = remark;
-
 
61
	}
-
 
62
 
52
	@Transient
63
	@Transient
53
	private String itemName;
64
	private String itemName;
54
 
65
 
55
	@Transient
66
	@Transient
56
	private String imgUrl;
67
	private String imgUrl;
Line 175... Line 186...
175
		result = prime * result + itemId;
186
		result = prime * result + itemId;
176
		result = prime * result + ((itemName == null) ? 0 : itemName.hashCode());
187
		result = prime * result + ((itemName == null) ? 0 : itemName.hashCode());
177
		result = prime * result + orderId;
188
		result = prime * result + orderId;
178
		result = prime * result + ((pendingOrder == null) ? 0 : pendingOrder.hashCode());
189
		result = prime * result + ((pendingOrder == null) ? 0 : pendingOrder.hashCode());
179
		result = prime * result + quantity;
190
		result = prime * result + quantity;
-
 
191
		result = prime * result + ((remark == null) ? 0 : remark.hashCode());
180
		result = prime * result + ((scheduledDeliveryTime == null) ? 0 : scheduledDeliveryTime.hashCode());
192
		result = prime * result + ((scheduledDeliveryTime == null) ? 0 : scheduledDeliveryTime.hashCode());
181
		result = prime * result + Float.floatToIntBits(sellingPrice);
193
		result = prime * result + Float.floatToIntBits(sellingPrice);
182
		result = prime * result + ((status == null) ? 0 : status.hashCode());
194
		result = prime * result + ((status == null) ? 0 : status.hashCode());
183
		result = prime * result + ((statusDescription == null) ? 0 : statusDescription.hashCode());
195
		result = prime * result + ((statusDescription == null) ? 0 : statusDescription.hashCode());
184
		result = prime * result + ((verifiedTimestamp == null) ? 0 : verifiedTimestamp.hashCode());
196
		result = prime * result + ((verifiedTimestamp == null) ? 0 : verifiedTimestamp.hashCode());
Line 240... Line 252...
240
				return false;
252
				return false;
241
		} else if (!pendingOrder.equals(other.pendingOrder))
253
		} else if (!pendingOrder.equals(other.pendingOrder))
242
			return false;
254
			return false;
243
		if (quantity != other.quantity)
255
		if (quantity != other.quantity)
244
			return false;
256
			return false;
-
 
257
		if (remark == null) {
-
 
258
			if (other.remark != null)
-
 
259
				return false;
-
 
260
		} else if (!remark.equals(other.remark))
-
 
261
			return false;
245
		if (scheduledDeliveryTime == null) {
262
		if (scheduledDeliveryTime == null) {
246
			if (other.scheduledDeliveryTime != null)
263
			if (other.scheduledDeliveryTime != null)
247
				return false;
264
				return false;
248
		} else if (!scheduledDeliveryTime.equals(other.scheduledDeliveryTime))
265
		} else if (!scheduledDeliveryTime.equals(other.scheduledDeliveryTime))
249
			return false;
266
			return false;
Line 324... Line 341...
324
		return serialVersionUID;
341
		return serialVersionUID;
325
	}
342
	}
326
 
343
 
327
	@Override
344
	@Override
328
	public String toString() {
345
	public String toString() {
329
		return "PendingOrderItem [id=" + id + ", orderId=" + orderId + ", itemId=" + itemId + ", itemName=" + itemName
346
		return "PendingOrderItem [id=" + id + ", orderId=" + orderId + ", itemId=" + itemId + ", remark=" + remark
330
				+ ", imgUrl=" + imgUrl + ", quantity=" + quantity + ", sellingPrice=" + sellingPrice + ", pendingOrder="
347
				+ ", itemName=" + itemName + ", imgUrl=" + imgUrl + ", quantity=" + quantity + ", sellingPrice="
331
				+ pendingOrder + ", status=" + status + ", statusDescription=" + statusDescription
348
				+ sellingPrice + ", pendingOrder=" + pendingOrder + ", status=" + status + ", statusDescription="
332
				+ ", cancelledTimestamp=" + cancelledTimestamp + ", billedTimestamp=" + billedTimestamp
349
				+ statusDescription + ", cancelledTimestamp=" + cancelledTimestamp + ", billedTimestamp="
333
				+ ", verifiedTimestamp=" + verifiedTimestamp + ", deliveredTimestamp=" + deliveredTimestamp
350
				+ billedTimestamp + ", verifiedTimestamp=" + verifiedTimestamp + ", deliveredTimestamp="
334
				+ ", claimedTimestamp=" + claimedTimestamp + ", scheduledDeliveryTime=" + scheduledDeliveryTime
351
				+ deliveredTimestamp + ", claimedTimestamp=" + claimedTimestamp + ", scheduledDeliveryTime="
335
				+ ", createTimestamp=" + createTimestamp + "]";
352
				+ scheduledDeliveryTime + ", createTimestamp=" + createTimestamp + "]";
336
	}
353
	}
337
 
354
 
338
}
355
}