WebSVN – SmartDukaan – Diff – /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Order.java



package com.spice.profitmandi.dao.entity.transaction;
 
import java.io.Serializable;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
 
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Convert;
import javax.persistence.Entity;

	private LocalDateTime outOfStockTimestamp;
	
	@Column(name = "transaction_id")
    private Integer transactionId;
	
	/*@Column(name = "jacket_number", length = 10)
	private Integer jacketNumber;*/
	
	@Column(name = "receiver", length = 50)
	private String receiver;
	
	@Column(name = "batchNo")

	private String refundBy;
	
	@Column(name = "refund_reason", length = 256)
	private String refundReason;
	
	/*@Column(name = "delay_reason")
	private DelayReason delayReason;*/
	
	@Convert(converter = LocalDateTimeAttributeConverter.class)
	@Column(name = "cod_reconciliation_timestamp")
	private LocalDateTime codReconciliationTimestamp;
	

	}
	public void setTransactionId(Integer transactionId) {
		this.transactionId = transactionId;
	}
	
	/*public Integer getJacketNumber() {
		return jacketNumber;
	}
	public void setJacketNumber(Integer jacketNumber) {
		this.jacketNumber = jacketNumber;
	}*/
	public String getReceiver() {
		return receiver;
	}
	public void setReceiver(String receiver) {
		this.receiver = receiver;

		return refundReason;
	}
	public void setRefundReason(String refundReason) {
		this.refundReason = refundReason;
	}
	/*public DelayReason getDelayReason() {
		return delayReason;
	}
	public void setDelayReason(DelayReason delayReason) {
		this.delayReason = delayReason;
	}*/
	public LocalDateTime getCodReconciliationTimestamp() {
		return codReconciliationTimestamp;
	}
	public void setCodReconciliationTimestamp(LocalDateTime codReconciliationTimestamp) {
		this.codReconciliationTimestamp = codReconciliationTimestamp;

	}
	public void setLineItem(LineItem lineItem) {
		this.lineItem = lineItem;
	}
	
	public String getFormattedDate(){
    	DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd-MM-YYYY HH:mm");
		return this.createTimestamp.format(formatter);
    }
	
	
	@Override
	public int hashCode() {
		final int prime = 31;
		int result = 1;

				+ totalAmount + ", gvAmount=" + gvAmount + ", totalWeight=" + totalWeight + ", invoiceNumber="
				+ invoiceNumber + ", billedBy=" + billedBy + ", createTimestamp=" + createTimestamp
				+ ", acceptedTimestamp=" + acceptedTimestamp + ", billingTimestamp=" + billingTimestamp
				+ ", shippingTimestamp=" + shippingTimestamp + ", pickupTimestamp=" + pickupTimestamp
				+ ", deliveryTimestamp=" + deliveryTimestamp + ", outOfStockTimestamp=" + outOfStockTimestamp
				/*+ ", jacketNumber=" + jacketNumber*/ + ", receiver=" + receiver
				+ ", batchNumber=" + batchNumber + ", serialNumber=" + serialNumber + ", doaFlag=" + doaFlag
				+ ", pickupRequestNumber=" + pickupRequestNumber + ", newOrderId=" + newOrderId + ", doaAuthTimestamp="
				+ doaAuthTimestamp + ", doaPickupTimestamp=" + doaPickupTimestamp + ", receiverReturnTimestamp="
				+ receiverReturnTimestamp + ", reShipTimestamp=" + reShipTimestamp + ", refundTimestamp="
				+ refundTimestamp + ", purchaseOrderId=" + purchaseOrderId + ", cod=" + cod + ", verificationTimestamp="
				+ verificationTimestamp + ", refundBy=" + refundBy + ", refundReason=" + refundReason /*+ ", delayReason="
				+ delayReason*/ + ", codReconciliationTimestamp=" + codReconciliationTimestamp + ", previousStatus="
				+ previousStatus + ", vendorId=" + vendorId + ", delayReasonText=" + delayReasonText
				+ ", doaLogisticsProviderId=" + doaLogisticsProviderId + ", vendorPaid=" + vendorPaid
				+ ", localConnectedTimestamp=" + localConnectedTimestamp + ", reachedDestinationTimestamp="
				+ reachedDestinationTimestamp + ", firstDlvyatmpTimestamp=" + firstDlvyatmpTimestamp
				+ ", originalOrderId=" + originalOrderId + ", fulfilmentWarehouseId=" + fulfilmentWarehouseId

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Order.java – Rev 22925 → 23075

Rev 22925		Rev 23075
Line 1...		Line 1...
1	`package com.spice.profitmandi.dao.entity.transaction;`	1	`package com.spice.profitmandi.dao.entity.transaction;`
2		2
3	`import java.io.Serializable;`	3	`import java.io.Serializable;`
4	`import java.time.LocalDateTime;`	4	`import java.time.LocalDateTime;`
-		5	`import java.time.format.DateTimeFormatter;`
5		6
6	`import javax.persistence.CascadeType;`	7	`import javax.persistence.CascadeType;`
7	`import javax.persistence.Column;`	8	`import javax.persistence.Column;`
8	`import javax.persistence.Convert;`	9	`import javax.persistence.Convert;`
9	`import javax.persistence.Entity;`	10	`import javax.persistence.Entity;`
Line 177...		Line 178...
177	`private LocalDateTime outOfStockTimestamp;`	178	`private LocalDateTime outOfStockTimestamp;`
178		179
179	`@Column(name = "transaction_id")`	180	`@Column(name = "transaction_id")`
180	`private Integer transactionId;`	181	`private Integer transactionId;`
181		182
182	`@Column(name = "jacket_number", length = 10)`	183	`/*@Column(name = "jacket_number", length = 10)`
183	`private Integer jacketNumber;`	184	`private Integer jacketNumber;*/`
184		185
185	`@Column(name = "receiver", length = 50)`	186	`@Column(name = "receiver", length = 50)`
186	`private String receiver;`	187	`private String receiver;`
187		188
188	`@Column(name = "batchNo")`	189	`@Column(name = "batchNo")`
Line 233...		Line 234...
233	`private String refundBy;`	234	`private String refundBy;`
234		235
235	`@Column(name = "refund_reason", length = 256)`	236	`@Column(name = "refund_reason", length = 256)`
236	`private String refundReason;`	237	`private String refundReason;`
237		238
238	`@Column(name = "delay_reason")`	239	`/*@Column(name = "delay_reason")`
239	`private DelayReason delayReason;`	240	`private DelayReason delayReason;*/`
240		241
241	`@Convert(converter = LocalDateTimeAttributeConverter.class)`	242	`@Convert(converter = LocalDateTimeAttributeConverter.class)`
242	`@Column(name = "cod_reconciliation_timestamp")`	243	`@Column(name = "cod_reconciliation_timestamp")`
243	`private LocalDateTime codReconciliationTimestamp;`	244	`private LocalDateTime codReconciliationTimestamp;`
244		245
Line 552...		Line 553...
552	`}`	553	`}`
553	`public void setTransactionId(Integer transactionId) {`	554	`public void setTransactionId(Integer transactionId) {`
554	`this.transactionId = transactionId;`	555	`this.transactionId = transactionId;`
555	`}`	556	`}`
556		557
557	`public Integer getJacketNumber() {`	558	`/*public Integer getJacketNumber() {`
558	`return jacketNumber;`	559	`return jacketNumber;`
559	`}`	560	`}`
560	`public void setJacketNumber(Integer jacketNumber) {`	561	`public void setJacketNumber(Integer jacketNumber) {`
561	`this.jacketNumber = jacketNumber;`	562	`this.jacketNumber = jacketNumber;`
562	`}`	563	`}*/`
563	`public String getReceiver() {`	564	`public String getReceiver() {`
564	`return receiver;`	565	`return receiver;`
565	`}`	566	`}`
566	`public void setReceiver(String receiver) {`	567	`public void setReceiver(String receiver) {`
567	`this.receiver = receiver;`	568	`this.receiver = receiver;`
Line 654...		Line 655...
654	`return refundReason;`	655	`return refundReason;`
655	`}`	656	`}`
656	`public void setRefundReason(String refundReason) {`	657	`public void setRefundReason(String refundReason) {`
657	`this.refundReason = refundReason;`	658	`this.refundReason = refundReason;`
658	`}`	659	`}`
659	`public DelayReason getDelayReason() {`	660	`/*public DelayReason getDelayReason() {`
660	`return delayReason;`	661	`return delayReason;`
661	`}`	662	`}`
662	`public void setDelayReason(DelayReason delayReason) {`	663	`public void setDelayReason(DelayReason delayReason) {`
663	`this.delayReason = delayReason;`	664	`this.delayReason = delayReason;`
664	`}`	665	`}*/`
665	`public LocalDateTime getCodReconciliationTimestamp() {`	666	`public LocalDateTime getCodReconciliationTimestamp() {`
666	`return codReconciliationTimestamp;`	667	`return codReconciliationTimestamp;`
667	`}`	668	`}`
668	`public void setCodReconciliationTimestamp(LocalDateTime codReconciliationTimestamp) {`	669	`public void setCodReconciliationTimestamp(LocalDateTime codReconciliationTimestamp) {`
669	`this.codReconciliationTimestamp = codReconciliationTimestamp;`	670	`this.codReconciliationTimestamp = codReconciliationTimestamp;`
Line 854...		Line 855...
854	`}`	855	`}`
855	`public void setLineItem(LineItem lineItem) {`	856	`public void setLineItem(LineItem lineItem) {`
856	`this.lineItem = lineItem;`	857	`this.lineItem = lineItem;`
857	`}`	858	`}`
858		859
-		860	`public String getFormattedDate(){`
-		861	`DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd-MM-YYYY HH:mm");`
-		862	`return this.createTimestamp.format(formatter);`
-		863	`}`
-		864
859		865
860	`@Override`	866	`@Override`
861	`public int hashCode() {`	867	`public int hashCode() {`
862	`final int prime = 31;`	868	`final int prime = 31;`
863	`int result = 1;`	869	`int result = 1;`
Line 894...		Line 900...
894	`+ totalAmount + ", gvAmount=" + gvAmount + ", totalWeight=" + totalWeight + ", invoiceNumber="`	900	`+ totalAmount + ", gvAmount=" + gvAmount + ", totalWeight=" + totalWeight + ", invoiceNumber="`
895	`+ invoiceNumber + ", billedBy=" + billedBy + ", createTimestamp=" + createTimestamp`	901	`+ invoiceNumber + ", billedBy=" + billedBy + ", createTimestamp=" + createTimestamp`
896	`+ ", acceptedTimestamp=" + acceptedTimestamp + ", billingTimestamp=" + billingTimestamp`	902	`+ ", acceptedTimestamp=" + acceptedTimestamp + ", billingTimestamp=" + billingTimestamp`
897	`+ ", shippingTimestamp=" + shippingTimestamp + ", pickupTimestamp=" + pickupTimestamp`	903	`+ ", shippingTimestamp=" + shippingTimestamp + ", pickupTimestamp=" + pickupTimestamp`
898	`+ ", deliveryTimestamp=" + deliveryTimestamp + ", outOfStockTimestamp=" + outOfStockTimestamp`	904	`+ ", deliveryTimestamp=" + deliveryTimestamp + ", outOfStockTimestamp=" + outOfStockTimestamp`
899	`+ ", jacketNumber=" + jacketNumber + ", receiver=" + receiver`	905	`/+ ", jacketNumber=" + jacketNumber/ + ", receiver=" + receiver`
900	`+ ", batchNumber=" + batchNumber + ", serialNumber=" + serialNumber + ", doaFlag=" + doaFlag`	906	`+ ", batchNumber=" + batchNumber + ", serialNumber=" + serialNumber + ", doaFlag=" + doaFlag`
901	`+ ", pickupRequestNumber=" + pickupRequestNumber + ", newOrderId=" + newOrderId + ", doaAuthTimestamp="`	907	`+ ", pickupRequestNumber=" + pickupRequestNumber + ", newOrderId=" + newOrderId + ", doaAuthTimestamp="`
902	`+ doaAuthTimestamp + ", doaPickupTimestamp=" + doaPickupTimestamp + ", receiverReturnTimestamp="`	908	`+ doaAuthTimestamp + ", doaPickupTimestamp=" + doaPickupTimestamp + ", receiverReturnTimestamp="`
903	`+ receiverReturnTimestamp + ", reShipTimestamp=" + reShipTimestamp + ", refundTimestamp="`	909	`+ receiverReturnTimestamp + ", reShipTimestamp=" + reShipTimestamp + ", refundTimestamp="`
904	`+ refundTimestamp + ", purchaseOrderId=" + purchaseOrderId + ", cod=" + cod + ", verificationTimestamp="`	910	`+ refundTimestamp + ", purchaseOrderId=" + purchaseOrderId + ", cod=" + cod + ", verificationTimestamp="`
905	`+ verificationTimestamp + ", refundBy=" + refundBy + ", refundReason=" + refundReason + ", delayReason="`	911	`+ verificationTimestamp + ", refundBy=" + refundBy + ", refundReason=" + refundReason /*+ ", delayReason="`
906	`+ delayReason + ", codReconciliationTimestamp=" + codReconciliationTimestamp + ", previousStatus="`	912	`+ delayReason*/ + ", codReconciliationTimestamp=" + codReconciliationTimestamp + ", previousStatus="`
907	`+ previousStatus + ", vendorId=" + vendorId + ", delayReasonText=" + delayReasonText`	913	`+ previousStatus + ", vendorId=" + vendorId + ", delayReasonText=" + delayReasonText`
908	`+ ", doaLogisticsProviderId=" + doaLogisticsProviderId + ", vendorPaid=" + vendorPaid`	914	`+ ", doaLogisticsProviderId=" + doaLogisticsProviderId + ", vendorPaid=" + vendorPaid`
909	`+ ", localConnectedTimestamp=" + localConnectedTimestamp + ", reachedDestinationTimestamp="`	915	`+ ", localConnectedTimestamp=" + localConnectedTimestamp + ", reachedDestinationTimestamp="`
910	`+ reachedDestinationTimestamp + ", firstDlvyatmpTimestamp=" + firstDlvyatmpTimestamp`	916	`+ reachedDestinationTimestamp + ", firstDlvyatmpTimestamp=" + firstDlvyatmpTimestamp`
911	`+ ", originalOrderId=" + originalOrderId + ", fulfilmentWarehouseId=" + fulfilmentWarehouseId`	917	`+ ", originalOrderId=" + originalOrderId + ", fulfilmentWarehouseId=" + fulfilmentWarehouseId`