Subversion Repositories SmartDukaan

Rev

Rev 34474 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 34474 Rev 34902
Line 71... Line 71...
71
	private LocalDateTime claimedTimestamp;
71
	private LocalDateTime claimedTimestamp;
72
 
72
 
73
	@Column(name = "originalOrderId")
73
	@Column(name = "originalOrderId")
74
	private int originalOrderId;
74
	private int originalOrderId;
75
 
75
 
-
 
76
	@Column(name = "smart_seller_id")
-
 
77
	private String smartSellerId;
-
 
78
 
76
	@Column(name = "scheduled_delivery_time")
79
	@Column(name = "scheduled_delivery_time")
77
	private LocalDateTime scheduledDeliveryTime;
80
	private LocalDateTime scheduledDeliveryTime;
78
 
81
 
79
	@Convert(converter = LocalDateTimeAttributeConverter.class)
82
	@Convert(converter = LocalDateTimeAttributeConverter.class)
80
	@Column(name = "create_timestamp")
83
	@Column(name = "create_timestamp")
Line 280... Line 283...
280
 
283
 
281
	public void setFofoOrderItem(FofoOrderItem fofoOrderItem) {
284
	public void setFofoOrderItem(FofoOrderItem fofoOrderItem) {
282
		this.fofoOrderItem = fofoOrderItem;
285
		this.fofoOrderItem = fofoOrderItem;
283
	}
286
	}
284
 
287
 
-
 
288
	public String getSmartSellerId() {
-
 
289
		return smartSellerId;
-
 
290
	}
-
 
291
 
-
 
292
	public void setSmartSellerId(String smartSellerId) {
-
 
293
		this.smartSellerId = smartSellerId;
-
 
294
	}
-
 
295
 
285
	@Override
296
	@Override
286
	public boolean equals(Object o) {
297
	public boolean equals(Object o) {
287
		if (this == o) return true;
298
		if (this == o) return true;
288
		if (o == null || getClass() != o.getClass()) return false;
299
		if (o == null || getClass() != o.getClass()) return false;
289
		PendingOrderItem that = (PendingOrderItem) o;
300
		PendingOrderItem that = (PendingOrderItem) o;
Line 314... Line 325...
314
				", billedTimestamp=" + billedTimestamp +
325
				", billedTimestamp=" + billedTimestamp +
315
				", verifiedTimestamp=" + verifiedTimestamp +
326
				", verifiedTimestamp=" + verifiedTimestamp +
316
				", deliveredTimestamp=" + deliveredTimestamp +
327
				", deliveredTimestamp=" + deliveredTimestamp +
317
				", claimedTimestamp=" + claimedTimestamp +
328
				", claimedTimestamp=" + claimedTimestamp +
318
				", originalOrderId=" + originalOrderId +
329
				", originalOrderId=" + originalOrderId +
-
 
330
				", smartSellerId=" + smartSellerId +
319
				", scheduledDeliveryTime=" + scheduledDeliveryTime +
331
				", scheduledDeliveryTime=" + scheduledDeliveryTime +
320
				", createTimestamp=" + createTimestamp +
332
				", createTimestamp=" + createTimestamp +
321
				", pendingOrderItemPolicyPlan=" + pendingOrderItemPolicyPlan +
333
				", pendingOrderItemPolicyPlan=" + pendingOrderItemPolicyPlan +
322
				'}';
334
				'}';
323
	}
335
	}