Subversion Repositories SmartDukaan

Rev

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

Rev 23691 Rev 23884
Line 93... Line 93...
93
	
93
	
94
	@Convert(converter = LocalDateTimeAttributeConverter.class)
94
	@Convert(converter = LocalDateTimeAttributeConverter.class)
95
	@Column(name = "promised_shipping_time")
95
	@Column(name = "promised_shipping_time")
96
	private LocalDateTime promisedShippingTime;
96
	private LocalDateTime promisedShippingTime;
97
	
97
	
-
 
98
	@Convert(converter = LocalDateTimeAttributeConverter.class)
-
 
99
	@Column(name = "partner_grn_timestamp")
-
 
100
	private LocalDateTime partnerGrnTimestamp;
-
 
101
	
-
 
102
	public LocalDateTime getPartnerPurchaseTimestamp() {
-
 
103
		return partnerGrnTimestamp;
-
 
104
	}
-
 
105
	public void setPartnerPurchaseTimestamp(LocalDateTime partnerGrnTimestamp) {
-
 
106
		this.partnerGrnTimestamp = partnerGrnTimestamp;
-
 
107
	}
-
 
108
 
98
	@Column(name = "customer_id")
109
	@Column(name = "customer_id")
99
	private Integer retailerId;
110
	private Integer retailerId;
100
	
111
	
101
	@Column(name = "customer_name", length = 50)
112
	@Column(name = "customer_name", length = 50)
102
	private String retailerName;
113
	private String retailerName;
Line 885... Line 896...
885
	public String toString() {
896
	public String toString() {
886
		return "Order [id=" + id + ", warehouseId=" + warehouseId + ", sellerId=" + sellerId + ", warehouseAddressId="
897
		return "Order [id=" + id + ", warehouseId=" + warehouseId + ", sellerId=" + sellerId + ", warehouseAddressId="
887
				+ warehouseAddressId + ", logisticsProviderId=" + logisticsProviderId + ", airwayBillNumber="
898
				+ warehouseAddressId + ", logisticsProviderId=" + logisticsProviderId + ", airwayBillNumber="
888
				+ airwayBillNumber + ", trackingId=" + trackingId + ", expectedDeliveryTime=" + expectedDeliveryTime
899
				+ airwayBillNumber + ", trackingId=" + trackingId + ", expectedDeliveryTime=" + expectedDeliveryTime
889
				+ ", promisedDeliveryTime=" + promisedDeliveryTime + ", expectedShippingTime=" + expectedShippingTime
900
				+ ", promisedDeliveryTime=" + promisedDeliveryTime + ", expectedShippingTime=" + expectedShippingTime
890
				+ ", promisedShippingTime=" + promisedShippingTime + ", retailerId=" + retailerId + ", retailerName="
901
				+ ", promisedShippingTime=" + promisedShippingTime + ", partnerPurchaseTimestamp="
-
 
902
				+ partnerGrnTimestamp + ", retailerId=" + retailerId + ", retailerName=" + retailerName
891
				+ retailerName + ", retailerMobileNumber=" + retailerMobileNumber + ", retailerPinCode="
903
				+ ", retailerMobileNumber=" + retailerMobileNumber + ", retailerPinCode=" + retailerPinCode
892
				+ retailerPinCode + ", retailerAddress1=" + retailerAddress1 + ", retailerAddress2=" + retailerAddress2
904
				+ ", retailerAddress1=" + retailerAddress1 + ", retailerAddress2=" + retailerAddress2
893
				+ ", retailerCity=" + retailerCity + ", retailerState=" + retailerState + ", retailerEmailId="
905
				+ ", retailerCity=" + retailerCity + ", retailerState=" + retailerState + ", retailerEmailId="
894
				+ retailerEmailId + ", status=" + status + ", statusDescription=" + statusDescription + ", totalAmount="
906
				+ retailerEmailId + ", status=" + status + ", statusDescription=" + statusDescription + ", totalAmount="
895
				+ totalAmount + ", gvAmount=" + gvAmount + ", totalWeight=" + totalWeight + ", invoiceNumber="
907
				+ totalAmount + ", gvAmount=" + gvAmount + ", totalWeight=" + totalWeight + ", invoiceNumber="
896
				+ invoiceNumber + ", billedBy=" + billedBy + ", createTimestamp=" + createTimestamp
908
				+ invoiceNumber + ", billedBy=" + billedBy + ", createTimestamp=" + createTimestamp
897
				+ ", acceptedTimestamp=" + acceptedTimestamp + ", billingTimestamp=" + billingTimestamp
909
				+ ", acceptedTimestamp=" + acceptedTimestamp + ", billingTimestamp=" + billingTimestamp
898
				+ ", shippingTimestamp=" + shippingTimestamp + ", pickupTimestamp=" + pickupTimestamp
910
				+ ", shippingTimestamp=" + shippingTimestamp + ", pickupTimestamp=" + pickupTimestamp
899
				+ ", deliveryTimestamp=" + deliveryTimestamp + ", outOfStockTimestamp=" + outOfStockTimestamp
911
				+ ", deliveryTimestamp=" + deliveryTimestamp + ", outOfStockTimestamp=" + outOfStockTimestamp
900
				/*+ ", jacketNumber=" + jacketNumber*/ + ", receiver=" + receiver
912
				+ ", transactionId=" + transactionId + ", receiver=" + receiver + ", batchNumber=" + batchNumber
901
				+ ", batchNumber=" + batchNumber + ", serialNumber=" + serialNumber + ", doaFlag=" + doaFlag
913
				+ ", serialNumber=" + serialNumber + ", doaFlag=" + doaFlag + ", pickupRequestNumber="
902
				+ ", pickupRequestNumber=" + pickupRequestNumber + ", newOrderId=" + newOrderId + ", doaAuthTimestamp="
914
				+ pickupRequestNumber + ", newOrderId=" + newOrderId + ", doaAuthTimestamp=" + doaAuthTimestamp
903
				+ doaAuthTimestamp + ", doaPickupTimestamp=" + doaPickupTimestamp + ", receiverReturnTimestamp="
915
				+ ", doaPickupTimestamp=" + doaPickupTimestamp + ", receiverReturnTimestamp=" + receiverReturnTimestamp
904
				+ receiverReturnTimestamp + ", reShipTimestamp=" + reShipTimestamp + ", refundTimestamp="
916
				+ ", reShipTimestamp=" + reShipTimestamp + ", refundTimestamp=" + refundTimestamp + ", purchaseOrderId="
905
				+ refundTimestamp + ", purchaseOrderId=" + purchaseOrderId + ", cod=" + cod + ", verificationTimestamp="
917
				+ purchaseOrderId + ", cod=" + cod + ", verificationTimestamp=" + verificationTimestamp + ", refundBy="
906
				+ verificationTimestamp + ", refundBy=" + refundBy + ", refundReason=" + refundReason /*+ ", delayReason="
918
				+ refundBy + ", refundReason=" + refundReason + ", codReconciliationTimestamp="
907
				+ delayReason*/ + ", codReconciliationTimestamp=" + codReconciliationTimestamp + ", previousStatus="
919
				+ codReconciliationTimestamp + ", previousStatus=" + previousStatus + ", vendorId=" + vendorId
908
				+ previousStatus + ", vendorId=" + vendorId + ", delayReasonText=" + delayReasonText
-
 
909
				+ ", doaLogisticsProviderId=" + doaLogisticsProviderId + ", vendorPaid=" + vendorPaid
920
				+ ", delayReasonText=" + delayReasonText + ", doaLogisticsProviderId=" + doaLogisticsProviderId
910
				+ ", localConnectedTimestamp=" + localConnectedTimestamp + ", reachedDestinationTimestamp="
921
				+ ", vendorPaid=" + vendorPaid + ", localConnectedTimestamp=" + localConnectedTimestamp
911
				+ reachedDestinationTimestamp + ", firstDlvyatmpTimestamp=" + firstDlvyatmpTimestamp
922
				+ ", reachedDestinationTimestamp=" + reachedDestinationTimestamp + ", firstDlvyatmpTimestamp="
912
				+ ", originalOrderId=" + originalOrderId + ", fulfilmentWarehouseId=" + fulfilmentWarehouseId
923
				+ firstDlvyatmpTimestamp + ", originalOrderId=" + originalOrderId + ", fulfilmentWarehouseId="
913
				+ ", orderType=" + orderType + ", pickupStoreId=" + pickupStoreId + ", otg=" + otg
924
				+ fulfilmentWarehouseId + ", orderType=" + orderType + ", pickupStoreId=" + pickupStoreId + ", otg="
914
				+ ", courierDeliveryTimestamp=" + courierDeliveryTimestamp + ", insurer=" + insurer
925
				+ otg + ", courierDeliveryTimestamp=" + courierDeliveryTimestamp + ", insurer=" + insurer
915
				+ ", insuranceAmount=" + insuranceAmount + ", freebieItemId=" + freebieItemId + ", source=" + source
926
				+ ", insuranceAmount=" + insuranceAmount + ", freebieItemId=" + freebieItemId + ", source=" + source
916
				+ ", advanceAmount=" + advanceAmount + ", storeId=" + storeId + ", productCondition=" + productCondition
927
				+ ", advanceAmount=" + advanceAmount + ", storeId=" + storeId + ", productCondition=" + productCondition
917
				+ ", dataProtectionInsurer=" + dataProtectionInsurer + ", dataProtectionAmount=" + dataProtectionAmount
928
				+ ", dataProtectionInsurer=" + dataProtectionInsurer + ", dataProtectionAmount=" + dataProtectionAmount
918
				+ ", taxType=" + taxType + ", logisticsTransactionId=" + logisticsTransactionId + ", shippingCost="
929
				+ ", taxType=" + taxType + ", logisticsTransactionId=" + logisticsTransactionId + ", shippingCost="
919
				+ shippingCost + ", codCharges=" + codCharges + ", walletAmount=" + walletAmount + ", netPayableAmount="
930
				+ shippingCost + ", codCharges=" + codCharges + ", walletAmount=" + walletAmount + ", netPayableAmount="
920
				+ netPayableAmount + ", shippingRefund=" + shippingRefund + "]";
931
				+ netPayableAmount + ", shippingRefund=" + shippingRefund + ", lineItem=" + lineItem + "]";
921
	}
932
	}
922
    
933
    
923
}
934
}
924
935