Subversion Repositories SmartDukaan

Rev

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

Rev 21984 Rev 22009
Line 3... Line 3...
3 
import java.io.Serializable;
 3 
import java.io.Serializable;
4 
import java.time.LocalDateTime;
 4 
import java.time.LocalDateTime;
5 
 
 5 
 
6 
import javax.persistence.CascadeType;
 6 
import javax.persistence.CascadeType;
7 
import javax.persistence.Column;
 7 
import javax.persistence.Column;
- 
 
 8 
import javax.persistence.Convert;
8 
import javax.persistence.Entity;
 9 
import javax.persistence.Entity;
9 
import javax.persistence.EnumType;
 10 
import javax.persistence.EnumType;
10 
import javax.persistence.Enumerated;
 11 
import javax.persistence.Enumerated;
11 
import javax.persistence.FetchType;
 12 
import javax.persistence.FetchType;
12 
import javax.persistence.GeneratedValue;
 13 
import javax.persistence.GeneratedValue;
Line 14... Line 15...
14 
import javax.persistence.Id;
 15 
import javax.persistence.Id;
15 
import javax.persistence.JoinColumn;
 16 
import javax.persistence.JoinColumn;
16 
import javax.persistence.ManyToOne;
 17 
import javax.persistence.ManyToOne;
17 
import javax.persistence.NamedQueries;
 18 
import javax.persistence.NamedQueries;
18 
import javax.persistence.NamedQuery;
 19 
import javax.persistence.NamedQuery;
19 
import javax.persistence.OneToOne;
 - 
 
20 
import javax.persistence.Table;
 20 
import javax.persistence.Table;
21 
 
 21 
 
- 
 
 22 
import com.spice.profitmandi.dao.convertor.LocalDateTimeAttributeConverter;
- 
 
 23 
 
22 
import in.shop2020.model.v1.order.DelayReason;
 24 
import in.shop2020.model.v1.order.DelayReason;
23 
import in.shop2020.model.v1.order.OrderStatus;
 25 
import in.shop2020.model.v1.order.OrderStatus;
24 
import in.shop2020.model.v1.order.TaxType;
 26 
import in.shop2020.model.v1.order.TaxType;
25 
 
 27 
 
26 
/**
 28 
/**
Line 82... Line 84...
82 
	private String airwayBillNumber;
 84 
	private String airwayBillNumber;
83
85
84 
	@Column(name = "tracking_id", length = 50)
 86 
	@Column(name = "tracking_id", length = 50)
85 
	private String trackingId;
 87 
	private String trackingId;
86
88
- 
 
 89 
	@Convert(converter = LocalDateTimeAttributeConverter.class)
87 
	@Column(name = "expected_delivery_time")
 90 
	@Column(name = "expected_delivery_time")
88 
	private LocalDateTime expectedDeliveryTime;
 91 
	private LocalDateTime expectedDeliveryTime;
89
92
- 
 
 93 
	@Convert(converter = LocalDateTimeAttributeConverter.class)
90 
	@Column(name = "promised_delivery_time")
 94 
	@Column(name = "promised_delivery_time")
91 
	private LocalDateTime promisedDeliveryTime;
 95 
	private LocalDateTime promisedDeliveryTime;
92
96
- 
 
 97 
	@Convert(converter = LocalDateTimeAttributeConverter.class)
93 
	@Column(name = "expected_shipping_time")
 98 
	@Column(name = "expected_shipping_time")
94 
	private LocalDateTime expectedShippingTime;
 99 
	private LocalDateTime expectedShippingTime;
95
100
- 
 
 101 
	@Convert(converter = LocalDateTimeAttributeConverter.class)
96 
	@Column(name = "promised_shipping_time")
 102 
	@Column(name = "promised_shipping_time")
97 
	private LocalDateTime promisedShippingTime;
 103 
	private LocalDateTime promisedShippingTime;
98
104
99 
	@Column(name = "customer_id")
 105 
	@Column(name = "customer_id")
100 
	private Integer retailerId;
 106 
	private Integer retailerId;
Line 143... Line 149...
143 
	private String invoiceNumber;
 149 
	private String invoiceNumber;
144
150
145 
	@Column(name = "billed_by", length = 30)
 151 
	@Column(name = "billed_by", length = 30)
146 
	private String billedBy;
 152 
	private String billedBy;
147
153
- 
 
 154 
	@Convert(converter = LocalDateTimeAttributeConverter.class)
148 
	@Column(name = "created_timestamp")
 155 
	@Column(name = "created_timestamp")
149 
	private LocalDateTime createTimestamp;
 156 
	private LocalDateTime createTimestamp;
150
157
- 
 
 158 
	@Convert(converter = LocalDateTimeAttributeConverter.class)
151 
	@Column(name = "accepted_timestamp")
 159 
	@Column(name = "accepted_timestamp")
152 
	private LocalDateTime acceptedTimestamp;
 160 
	private LocalDateTime acceptedTimestamp;
153
161
- 
 
 162 
	@Convert(converter = LocalDateTimeAttributeConverter.class)
154 
	@Column(name = "billing_timestamp")
 163 
	@Column(name = "billing_timestamp")
155 
	private LocalDateTime billingTimestamp;
 164 
	private LocalDateTime billingTimestamp;
156
165
- 
 
 166 
	@Convert(converter = LocalDateTimeAttributeConverter.class)
157 
	@Column(name = "shipping_timestamp")
 167 
	@Column(name = "shipping_timestamp")
158 
	private LocalDateTime shippingTimestamp;
 168 
	private LocalDateTime shippingTimestamp;
159
169
- 
 
 170 
	@Convert(converter = LocalDateTimeAttributeConverter.class)
160 
	@Column(name = "pickup_timestamp")
 171 
	@Column(name = "pickup_timestamp")
161 
	private LocalDateTime pickupTimestamp;
 172 
	private LocalDateTime pickupTimestamp;
162
173
- 
 
 174 
	@Convert(converter = LocalDateTimeAttributeConverter.class)
163 
	@Column(name = "delivery_timestamp")
 175 
	@Column(name = "delivery_timestamp")
164 
	private LocalDateTime deliveryTimestamp;
 176 
	private LocalDateTime deliveryTimestamp;
165
177
- 
 
 178 
	@Convert(converter = LocalDateTimeAttributeConverter.class)
166 
	@Column(name = "outofstock_timestamp")
 179 
	@Column(name = "outofstock_timestamp")
167 
	private LocalDateTime outOfStockTimestamp;
 180 
	private LocalDateTime outOfStockTimestamp;
168
181
169 
	@Column(name = "transaction_id")
 182 
	@Column(name = "transaction_id")
170 
    private Integer transactionId;
 183 
    private Integer transactionId;
Line 191... Line 204...
191 
	private Integer newOrderId;
 204 
	private Integer newOrderId;
192
205
193 
	@Column(name = "doa_auth_timestamp")
 206 
	@Column(name = "doa_auth_timestamp")
194 
	private LocalDateTime doaAuthTimestamp;
 207 
	private LocalDateTime doaAuthTimestamp;
195
208
- 
 
 209 
	@Convert(converter = LocalDateTimeAttributeConverter.class)
196 
	@Column(name = "doa_pickup_timestamp")
 210 
	@Column(name = "doa_pickup_timestamp")
197 
	private LocalDateTime doaPickupTimestamp;
 211 
	private LocalDateTime doaPickupTimestamp;
198
212
- 
 
 213 
	@Convert(converter = LocalDateTimeAttributeConverter.class)
199 
	@Column(name = "received_return_timestamp")
 214 
	@Column(name = "received_return_timestamp")
200 
	private LocalDateTime receiverReturnTimestamp;
 215 
	private LocalDateTime receiverReturnTimestamp;
201
216
- 
 
 217 
	@Convert(converter = LocalDateTimeAttributeConverter.class)
202 
	@Column(name = "reship_timestamp")
 218 
	@Column(name = "reship_timestamp")
203 
	private LocalDateTime reShipTimestamp;
 219 
	private LocalDateTime reShipTimestamp;
204
220
- 
 
 221 
	@Convert(converter = LocalDateTimeAttributeConverter.class)
205 
	@Column(name = "refund_timestamp")
 222 
	@Column(name = "refund_timestamp")
206 
	private LocalDateTime refundTimestamp;
 223 
	private LocalDateTime refundTimestamp;
207
224
208 
	@Column(name = "purchase_order_id")
 225 
	@Column(name = "purchase_order_id")
209 
	private Integer purchaseOrderId;
 226 
	private Integer purchaseOrderId;
210
227
211 
	@Column(name = "cod", columnDefinition="tinyInteger(1) default 0")
 228 
	@Column(name = "cod", columnDefinition="tinyInteger(1) default 0")
212 
	private Boolean cod;
 229 
	private Boolean cod;
213
230
- 
 
 231 
	@Convert(converter = LocalDateTimeAttributeConverter.class)
214 
	@Column(name = "verification_timestamp")
 232 
	@Column(name = "verification_timestamp")
215 
	private LocalDateTime verificationTimestamp;
 233 
	private LocalDateTime verificationTimestamp;
216
234
217 
	@Column(name = "refunded_by", length = 30)
 235 
	@Column(name = "refunded_by", length = 30)
218 
	private String refundBy;
 236 
	private String refundBy;
Line 221... Line 239...
221 
	private String refundReason;
 239 
	private String refundReason;
222
240
223 
	@Column(name = "delay_reason")
 241 
	@Column(name = "delay_reason")
224 
	private DelayReason delayReason;
 242 
	private DelayReason delayReason;
225
243
- 
 
 244 
	@Convert(converter = LocalDateTimeAttributeConverter.class)
226 
	@Column(name = "cod_reconciliation_timestamp")
 245 
	@Column(name = "cod_reconciliation_timestamp")
227 
	private LocalDateTime codReconciliationTimestamp;
 246 
	private LocalDateTime codReconciliationTimestamp;
228
247
229 
	private Integer previousStatus;
 248 
	private Integer previousStatus;
230
249
Line 239... Line 258...
239 
	private Integer doaLogisticsProviderId;
 258 
	private Integer doaLogisticsProviderId;
240
259
241 
	@Column(name = "vendor_paid", columnDefinition="tinyInteger(1) default 0")
 260 
	@Column(name = "vendor_paid", columnDefinition="tinyInteger(1) default 0")
242 
	private Boolean vendorPaid;
 261 
	private Boolean vendorPaid;
243
262
- 
 
 263 
	@Convert(converter = LocalDateTimeAttributeConverter.class)
244 
	@Column(name = "local_connected_timestamp")
 264 
	@Column(name = "local_connected_timestamp")
245 
	private LocalDateTime localConnectedTimestamp;
 265 
	private LocalDateTime localConnectedTimestamp;
246
266
- 
 
 267 
	@Convert(converter = LocalDateTimeAttributeConverter.class)
247 
	@Column(name = "reached_destination_timestamp")
 268 
	@Column(name = "reached_destination_timestamp")
248 
	private LocalDateTime reachedDestinationTimestamp;
 269 
	private LocalDateTime reachedDestinationTimestamp;
249
270
- 
 
 271 
	@Convert(converter = LocalDateTimeAttributeConverter.class)
250 
	@Column(name = "first_dlvyatmp_timestamp")
 272 
	@Column(name = "first_dlvyatmp_timestamp")
251 
	private LocalDateTime firstDlvyatmpTimestamp;
 273 
	private LocalDateTime firstDlvyatmpTimestamp;
252
274
253 
	@Column(name = "originalOrderId")
 275 
	@Column(name = "originalOrderId")
254 
	private Integer originalOrderId;
 276 
	private Integer originalOrderId;
Line 263... Line 285...
263 
	private Integer pickupStoreId;
 285 
	private Integer pickupStoreId;
264
286
265 
	@Column(name = "otg", columnDefinition="tinyInteger(1) default 0")
 287 
	@Column(name = "otg", columnDefinition="tinyInteger(1) default 0")
266 
	private Boolean otg;
 288 
	private Boolean otg;
267
289
- 
 
 290 
	@Convert(converter = LocalDateTimeAttributeConverter.class)
268 
	@Column(name = "courier_delivery_time")
 291 
	@Column(name = "courier_delivery_time")
269 
	private LocalDateTime courierDeliveryTimestamp;
 292 
	private LocalDateTime courierDeliveryTimestamp;
270
293
271
294
272 
	@Column(name = "insurer")
 295 
	@Column(name = "insurer")
Line 839... Line 862...
839
862
840 
	@Override
 863 
	@Override
841 
	public int hashCode() {
 864 
	public int hashCode() {
842 
		final int prime = 31;
 865 
		final int prime = 31;
843 
		int result = 1;
 866 
		int result = 1;
844 
		result = prime * result + ((acceptedTimestamp == null) ? 0 : acceptedTimestamp.hashCode());
 - 
 
845 
		result = prime * result + ((advanceAmount == null) ? 0 : advanceAmount.hashCode());
 - 
 
846 
		result = prime * result + ((airwayBillNumber == null) ? 0 : airwayBillNumber.hashCode());
 - 
 
847 
		result = prime * result + ((batchNumber == null) ? 0 : batchNumber.hashCode());
 - 
 
848 
		result = prime * result + ((billedBy == null) ? 0 : billedBy.hashCode());
 - 
 
849 
		result = prime * result + ((billingTimestamp == null) ? 0 : billingTimestamp.hashCode());
 - 
 
850 
		result = prime * result + ((cod == null) ? 0 : cod.hashCode());
 - 
 
851 
		result = prime * result + ((codCharges == null) ? 0 : codCharges.hashCode());
 - 
 
852 
		result = prime * result + ((codReconciliationTimestamp == null) ? 0 : codReconciliationTimestamp.hashCode());
 - 
 
853 
		result = prime * result + ((courierDeliveryTimestamp == null) ? 0 : courierDeliveryTimestamp.hashCode());
 - 
 
854 
		result = prime * result + ((createTimestamp == null) ? 0 : createTimestamp.hashCode());
 - 
 
855 
		result = prime * result + ((dataProtectionAmount == null) ? 0 : dataProtectionAmount.hashCode());
 - 
 
856 
		result = prime * result + ((dataProtectionInsurer == null) ? 0 : dataProtectionInsurer.hashCode());
 - 
 
857 
		result = prime * result + ((delayReason == null) ? 0 : delayReason.hashCode());
 - 
 
858 
		result = prime * result + ((delayReasonText == null) ? 0 : delayReasonText.hashCode());
 - 
 
859 
		result = prime * result + ((deliveryTimestamp == null) ? 0 : deliveryTimestamp.hashCode());
 - 
 
860 
		result = prime * result + ((doaAuthTimestamp == null) ? 0 : doaAuthTimestamp.hashCode());
 - 
 
861 
		result = prime * result + ((doaFlag == null) ? 0 : doaFlag.hashCode());
 - 
 
862 
		result = prime * result + ((doaLogisticsProviderId == null) ? 0 : doaLogisticsProviderId.hashCode());
 - 
 
863 
		result = prime * result + ((doaPickupTimestamp == null) ? 0 : doaPickupTimestamp.hashCode());
 - 
 
864 
		result = prime * result + ((expectedDeliveryTime == null) ? 0 : expectedDeliveryTime.hashCode());
 - 
 
865 
		result = prime * result + ((expectedShippingTime == null) ? 0 : expectedShippingTime.hashCode());
 - 
 
866 
		result = prime * result + ((firstDlvyatmpTimestamp == null) ? 0 : firstDlvyatmpTimestamp.hashCode());
 - 
 
867 
		result = prime * result + ((freebieItemId == null) ? 0 : freebieItemId.hashCode());
 - 
 
868 
		result = prime * result + ((fulfilmentWarehouseId == null) ? 0 : fulfilmentWarehouseId.hashCode());
 - 
 
869 
		result = prime * result + ((gvAmount == null) ? 0 : gvAmount.hashCode());
 - 
 
870 
		result = prime * result + ((id == null) ? 0 : id.hashCode());
 867 
		result = prime * result + ((id == null) ? 0 : id.hashCode());
871 
		result = prime * result + ((insuranceAmount == null) ? 0 : insuranceAmount.hashCode());
 - 
 
872 
		result = prime * result + ((insurer == null) ? 0 : insurer.hashCode());
 - 
 
873 
		result = prime * result + ((invoiceNumber == null) ? 0 : invoiceNumber.hashCode());
 - 
 
874 
		result = prime * result + ((jacketNumber == null) ? 0 : jacketNumber.hashCode());
 - 
 
875 
		result = prime * result + ((lineItem == null) ? 0 : lineItem.hashCode());
 - 
 
876 
		result = prime * result + ((localConnectedTimestamp == null) ? 0 : localConnectedTimestamp.hashCode());
 - 
 
877 
		result = prime * result + ((logisticsProviderId == null) ? 0 : logisticsProviderId.hashCode());
 - 
 
878 
		result = prime * result + ((logisticsTransactionId == null) ? 0 : logisticsTransactionId.hashCode());
 - 
 
879 
		result = prime * result + ((netPayableAmount == null) ? 0 : netPayableAmount.hashCode());
 - 
 
880 
		result = prime * result + ((newOrderId == null) ? 0 : newOrderId.hashCode());
 - 
 
881 
		result = prime * result + ((orderType == null) ? 0 : orderType.hashCode());
 - 
 
882 
		result = prime * result + ((originalOrderId == null) ? 0 : originalOrderId.hashCode());
 - 
 
883 
		result = prime * result + ((otg == null) ? 0 : otg.hashCode());
 - 
 
884 
		result = prime * result + ((outOfStockTimestamp == null) ? 0 : outOfStockTimestamp.hashCode());
 - 
 
885 
		result = prime * result + ((pickupRequestNumber == null) ? 0 : pickupRequestNumber.hashCode());
 - 
 
886 
		result = prime * result + ((pickupStoreId == null) ? 0 : pickupStoreId.hashCode());
 - 
 
887 
		result = prime * result + ((pickupTimestamp == null) ? 0 : pickupTimestamp.hashCode());
 - 
 
888 
		result = prime * result + ((previousStatus == null) ? 0 : previousStatus.hashCode());
 - 
 
889 
		result = prime * result + ((productCondition == null) ? 0 : productCondition.hashCode());
 - 
 
890 
		result = prime * result + ((promisedDeliveryTime == null) ? 0 : promisedDeliveryTime.hashCode());
 - 
 
891 
		result = prime * result + ((promisedShippingTime == null) ? 0 : promisedShippingTime.hashCode());
 - 
 
892 
		result = prime * result + ((purchaseOrderId == null) ? 0 : purchaseOrderId.hashCode());
 - 
 
893 
		result = prime * result + ((reShipTimestamp == null) ? 0 : reShipTimestamp.hashCode());
 - 
 
894 
		result = prime * result + ((reachedDestinationTimestamp == null) ? 0 : reachedDestinationTimestamp.hashCode());
 - 
 
895 
		result = prime * result + ((receiver == null) ? 0 : receiver.hashCode());
 - 
 
896 
		result = prime * result + ((receiverReturnTimestamp == null) ? 0 : receiverReturnTimestamp.hashCode());
 - 
 
897 
		result = prime * result + ((refundBy == null) ? 0 : refundBy.hashCode());
 - 
 
898 
		result = prime * result + ((refundReason == null) ? 0 : refundReason.hashCode());
 - 
 
899 
		result = prime * result + ((refundTimestamp == null) ? 0 : refundTimestamp.hashCode());
 - 
 
900 
		result = prime * result + ((retailerAddress1 == null) ? 0 : retailerAddress1.hashCode());
 - 
 
901 
		result = prime * result + ((retailerAddress2 == null) ? 0 : retailerAddress2.hashCode());
 - 
 
902 
		result = prime * result + ((retailerCity == null) ? 0 : retailerCity.hashCode());
 - 
 
903 
		result = prime * result + ((retailerEmailId == null) ? 0 : retailerEmailId.hashCode());
 - 
 
904 
		result = prime * result + ((retailerId == null) ? 0 : retailerId.hashCode());
 - 
 
905 
		result = prime * result + ((retailerMobileNumber == null) ? 0 : retailerMobileNumber.hashCode());
 - 
 
906 
		result = prime * result + ((retailerName == null) ? 0 : retailerName.hashCode());
 - 
 
907 
		result = prime * result + ((retailerPinCode == null) ? 0 : retailerPinCode.hashCode());
 - 
 
908 
		result = prime * result + ((retailerState == null) ? 0 : retailerState.hashCode());
 - 
 
909 
		result = prime * result + ((sellerId == null) ? 0 : sellerId.hashCode());
 - 
 
910 
		result = prime * result + ((serialNumber == null) ? 0 : serialNumber.hashCode());
 - 
 
911 
		result = prime * result + ((shippingCost == null) ? 0 : shippingCost.hashCode());
 - 
 
912 
		result = prime * result + ((shippingRefund == null) ? 0 : shippingRefund.hashCode());
 - 
 
913 
		result = prime * result + ((shippingTimestamp == null) ? 0 : shippingTimestamp.hashCode());
 - 
 
914 
		result = prime * result + ((source == null) ? 0 : source.hashCode());
 - 
 
915 
		result = prime * result + ((status == null) ? 0 : status.hashCode());
 - 
 
916 
		result = prime * result + ((statusDescription == null) ? 0 : statusDescription.hashCode());
 - 
 
917 
		result = prime * result + ((storeId == null) ? 0 : storeId.hashCode());
 - 
 
918 
		result = prime * result + ((taxType == null) ? 0 : taxType.hashCode());
 - 
 
919 
		result = prime * result + ((totalAmount == null) ? 0 : totalAmount.hashCode());
 - 
 
920 
		result = prime * result + ((totalWeight == null) ? 0 : totalWeight.hashCode());
 - 
 
921 
		result = prime * result + ((trackingId == null) ? 0 : trackingId.hashCode());
 - 
 
922 
		result = prime * result + ((transactionId == null) ? 0 : transactionId.hashCode());
 - 
 
923 
		result = prime * result + ((vendorId == null) ? 0 : vendorId.hashCode());
 - 
 
924 
		result = prime * result + ((vendorPaid == null) ? 0 : vendorPaid.hashCode());
 - 
 
925 
		result = prime * result + ((verificationTimestamp == null) ? 0 : verificationTimestamp.hashCode());
 - 
 
926 
		result = prime * result + ((walletAmount == null) ? 0 : walletAmount.hashCode());
 - 
 
927 
		result = prime * result + ((warehouseAddressId == null) ? 0 : warehouseAddressId.hashCode());
 - 
 
928 
		result = prime * result + ((warehouseId == null) ? 0 : warehouseId.hashCode());
 - 
 
929 
		return result;
 868 
		return result;
930 
	}
 869 
	}
931 
	@Override
 870 
	@Override
932 
	public boolean equals(Object obj) {
 871 
	public boolean equals(Object obj) {
933 
		if (this == obj)
 872 
		if (this == obj)
Line 935... Line 874...
935 
		if (obj == null)
 874 
		if (obj == null)
936 
			return false;
 875 
			return false;
937 
		if (getClass() != obj.getClass())
 876 
		if (getClass() != obj.getClass())
938 
			return false;
 877 
			return false;
939 
		Order other = (Order) obj;
 878 
		Order other = (Order) obj;
940 
		if (acceptedTimestamp == null) {
 - 
 
941 
			if (other.acceptedTimestamp != null)
 - 
 
942 
				return false;
 - 
 
943 
		} else if (!acceptedTimestamp.equals(other.acceptedTimestamp))
 - 
 
944 
			return false;
 - 
 
945 
		if (advanceAmount == null) {
 - 
 
946 
			if (other.advanceAmount != null)
 - 
 
947 
				return false;
 - 
 
948 
		} else if (!advanceAmount.equals(other.advanceAmount))
 - 
 
949 
			return false;
 - 
 
950 
		if (airwayBillNumber == null) {
 - 
 
951 
			if (other.airwayBillNumber != null)
 - 
 
952 
				return false;
 - 
 
953 
		} else if (!airwayBillNumber.equals(other.airwayBillNumber))
 - 
 
954 
			return false;
 - 
 
955 
		if (batchNumber == null) {
 - 
 
956 
			if (other.batchNumber != null)
 - 
 
957 
				return false;
 - 
 
958 
		} else if (!batchNumber.equals(other.batchNumber))
 - 
 
959 
			return false;
 - 
 
960 
		if (billedBy == null) {
 - 
 
961 
			if (other.billedBy != null)
 - 
 
962 
				return false;
 - 
 
963 
		} else if (!billedBy.equals(other.billedBy))
 - 
 
964 
			return false;
 - 
 
965 
		if (billingTimestamp == null) {
 - 
 
966 
			if (other.billingTimestamp != null)
 - 
 
967 
				return false;
 - 
 
968 
		} else if (!billingTimestamp.equals(other.billingTimestamp))
 - 
 
969 
			return false;
 - 
 
970 
		if (cod == null) {
 - 
 
971 
			if (other.cod != null)
 - 
 
972 
				return false;
 - 
 
973 
		} else if (!cod.equals(other.cod))
 - 
 
974 
			return false;
 - 
 
975 
		if (codCharges == null) {
 - 
 
976 
			if (other.codCharges != null)
 - 
 
977 
				return false;
 - 
 
978 
		} else if (!codCharges.equals(other.codCharges))
 - 
 
979 
			return false;
 - 
 
980 
		if (codReconciliationTimestamp == null) {
 - 
 
981 
			if (other.codReconciliationTimestamp != null)
 - 
 
982 
				return false;
 - 
 
983 
		} else if (!codReconciliationTimestamp.equals(other.codReconciliationTimestamp))
 - 
 
984 
			return false;
 - 
 
985 
		if (courierDeliveryTimestamp == null) {
 - 
 
986 
			if (other.courierDeliveryTimestamp != null)
 - 
 
987 
				return false;
 - 
 
988 
		} else if (!courierDeliveryTimestamp.equals(other.courierDeliveryTimestamp))
 - 
 
989 
			return false;
 - 
 
990 
		if (createTimestamp == null) {
 - 
 
991 
			if (other.createTimestamp != null)
 - 
 
992 
				return false;
 - 
 
993 
		} else if (!createTimestamp.equals(other.createTimestamp))
 - 
 
994 
			return false;
 - 
 
995 
		if (dataProtectionAmount == null) {
 - 
 
996 
			if (other.dataProtectionAmount != null)
 - 
 
997 
				return false;
 - 
 
998 
		} else if (!dataProtectionAmount.equals(other.dataProtectionAmount))
 - 
 
999 
			return false;
 - 
 
1000 
		if (dataProtectionInsurer == null) {
 - 
 
1001 
			if (other.dataProtectionInsurer != null)
 - 
 
1002 
				return false;
 - 
 
1003 
		} else if (!dataProtectionInsurer.equals(other.dataProtectionInsurer))
 - 
 
1004 
			return false;
 - 
 
1005 
		if (delayReason != other.delayReason)
 - 
 
1006 
			return false;
 - 
 
1007 
		if (delayReasonText == null) {
 - 
 
1008 
			if (other.delayReasonText != null)
 - 
 
1009 
				return false;
 - 
 
1010 
		} else if (!delayReasonText.equals(other.delayReasonText))
 - 
 
1011 
			return false;
 - 
 
1012 
		if (deliveryTimestamp == null) {
 - 
 
1013 
			if (other.deliveryTimestamp != null)
 - 
 
1014 
				return false;
 - 
 
1015 
		} else if (!deliveryTimestamp.equals(other.deliveryTimestamp))
 - 
 
1016 
			return false;
 - 
 
1017 
		if (doaAuthTimestamp == null) {
 - 
 
1018 
			if (other.doaAuthTimestamp != null)
 - 
 
1019 
				return false;
 - 
 
1020 
		} else if (!doaAuthTimestamp.equals(other.doaAuthTimestamp))
 - 
 
1021 
			return false;
 - 
 
1022 
		if (doaFlag == null) {
 - 
 
1023 
			if (other.doaFlag != null)
 - 
 
1024 
				return false;
 - 
 
1025 
		} else if (!doaFlag.equals(other.doaFlag))
 - 
 
1026 
			return false;
 - 
 
1027 
		if (doaLogisticsProviderId == null) {
 - 
 
1028 
			if (other.doaLogisticsProviderId != null)
 - 
 
1029 
				return false;
 - 
 
1030 
		} else if (!doaLogisticsProviderId.equals(other.doaLogisticsProviderId))
 - 
 
1031 
			return false;
 - 
 
1032 
		if (doaPickupTimestamp == null) {
 - 
 
1033 
			if (other.doaPickupTimestamp != null)
 - 
 
1034 
				return false;
 - 
 
1035 
		} else if (!doaPickupTimestamp.equals(other.doaPickupTimestamp))
 - 
 
1036 
			return false;
 - 
 
1037 
		if (expectedDeliveryTime == null) {
 - 
 
1038 
			if (other.expectedDeliveryTime != null)
 - 
 
1039 
				return false;
 - 
 
1040 
		} else if (!expectedDeliveryTime.equals(other.expectedDeliveryTime))
 - 
 
1041 
			return false;
 - 
 
1042 
		if (expectedShippingTime == null) {
 - 
 
1043 
			if (other.expectedShippingTime != null)
 - 
 
1044 
				return false;
 - 
 
1045 
		} else if (!expectedShippingTime.equals(other.expectedShippingTime))
 - 
 
1046 
			return false;
 - 
 
1047 
		if (firstDlvyatmpTimestamp == null) {
 - 
 
1048 
			if (other.firstDlvyatmpTimestamp != null)
 - 
 
1049 
				return false;
 - 
 
1050 
		} else if (!firstDlvyatmpTimestamp.equals(other.firstDlvyatmpTimestamp))
 - 
 
1051 
			return false;
 - 
 
1052 
		if (freebieItemId == null) {
 - 
 
1053 
			if (other.freebieItemId != null)
 - 
 
1054 
				return false;
 - 
 
1055 
		} else if (!freebieItemId.equals(other.freebieItemId))
 - 
 
1056 
			return false;
 - 
 
1057 
		if (fulfilmentWarehouseId == null) {
 - 
 
1058 
			if (other.fulfilmentWarehouseId != null)
 - 
 
1059 
				return false;
 - 
 
1060 
		} else if (!fulfilmentWarehouseId.equals(other.fulfilmentWarehouseId))
 - 
 
1061 
			return false;
 - 
 
1062 
		if (gvAmount == null) {
 - 
 
1063 
			if (other.gvAmount != null)
 - 
 
1064 
				return false;
 - 
 
1065 
		} else if (!gvAmount.equals(other.gvAmount))
 - 
 
1066 
			return false;
 - 
 
1067 
		if (id == null) {
 879 
		if (id == null) {
1068 
			if (other.id != null)
 880 
			if (other.id != null)
1069 
				return false;
 881 
				return false;
1070 
		} else if (!id.equals(other.id))
 882 
		} else if (!id.equals(other.id))
1071 
			return false;
 883 
			return false;
1072 
		if (insuranceAmount == null) {
 - 
 
1073 
			if (other.insuranceAmount != null)
 - 
 
1074 
				return false;
 - 
 
1075 
		} else if (!insuranceAmount.equals(other.insuranceAmount))
 - 
 
1076 
			return false;
 - 
 
1077 
		if (insurer == null) {
 - 
 
1078 
			if (other.insurer != null)
 - 
 
1079 
				return false;
 - 
 
1080 
		} else if (!insurer.equals(other.insurer))
 - 
 
1081 
			return false;
 - 
 
1082 
		if (invoiceNumber == null) {
 - 
 
1083 
			if (other.invoiceNumber != null)
 - 
 
1084 
				return false;
 - 
 
1085 
		} else if (!invoiceNumber.equals(other.invoiceNumber))
 - 
 
1086 
			return false;
 - 
 
1087 
		if (jacketNumber == null) {
 - 
 
1088 
			if (other.jacketNumber != null)
 - 
 
1089 
				return false;
 - 
 
1090 
		} else if (!jacketNumber.equals(other.jacketNumber))
 - 
 
1091 
			return false;
 - 
 
1092 
		if (lineItem == null) {
 - 
 
1093 
			if (other.lineItem != null)
 - 
 
1094 
				return false;
 - 
 
1095 
		} else if (!lineItem.equals(other.lineItem))
 - 
 
1096 
			return false;
 - 
 
1097 
		if (localConnectedTimestamp == null) {
 - 
 
1098 
			if (other.localConnectedTimestamp != null)
 - 
 
1099 
				return false;
 - 
 
1100 
		} else if (!localConnectedTimestamp.equals(other.localConnectedTimestamp))
 - 
 
1101 
			return false;
 - 
 
1102 
		if (logisticsProviderId == null) {
 - 
 
1103 
			if (other.logisticsProviderId != null)
 - 
 
1104 
				return false;
 - 
 
1105 
		} else if (!logisticsProviderId.equals(other.logisticsProviderId))
 - 
 
1106 
			return false;
 - 
 
1107 
		if (logisticsTransactionId == null) {
 - 
 
1108 
			if (other.logisticsTransactionId != null)
 - 
 
1109 
				return false;
 - 
 
1110 
		} else if (!logisticsTransactionId.equals(other.logisticsTransactionId))
 - 
 
1111 
			return false;
 - 
 
1112 
		if (netPayableAmount == null) {
 - 
 
1113 
			if (other.netPayableAmount != null)
 - 
 
1114 
				return false;
 - 
 
1115 
		} else if (!netPayableAmount.equals(other.netPayableAmount))
 - 
 
1116 
			return false;
 - 
 
1117 
		if (newOrderId == null) {
 - 
 
1118 
			if (other.newOrderId != null)
 - 
 
1119 
				return false;
 - 
 
1120 
		} else if (!newOrderId.equals(other.newOrderId))
 - 
 
1121 
			return false;
 - 
 
1122 
		if (orderType == null) {
 - 
 
1123 
			if (other.orderType != null)
 - 
 
1124 
				return false;
 - 
 
1125 
		} else if (!orderType.equals(other.orderType))
 - 
 
1126 
			return false;
 - 
 
1127 
		if (originalOrderId == null) {
 - 
 
1128 
			if (other.originalOrderId != null)
 - 
 
1129 
				return false;
 - 
 
1130 
		} else if (!originalOrderId.equals(other.originalOrderId))
 - 
 
1131 
			return false;
 - 
 
1132 
		if (otg == null) {
 - 
 
1133 
			if (other.otg != null)
 - 
 
1134 
				return false;
 - 
 
1135 
		} else if (!otg.equals(other.otg))
 - 
 
1136 
			return false;
 - 
 
1137 
		if (outOfStockTimestamp == null) {
 - 
 
1138 
			if (other.outOfStockTimestamp != null)
 - 
 
1139 
				return false;
 - 
 
1140 
		} else if (!outOfStockTimestamp.equals(other.outOfStockTimestamp))
 - 
 
1141 
			return false;
 - 
 
1142 
		if (pickupRequestNumber == null) {
 - 
 
1143 
			if (other.pickupRequestNumber != null)
 - 
 
1144 
				return false;
 - 
 
1145 
		} else if (!pickupRequestNumber.equals(other.pickupRequestNumber))
 - 
 
1146 
			return false;
 - 
 
1147 
		if (pickupStoreId == null) {
 - 
 
1148 
			if (other.pickupStoreId != null)
 - 
 
1149 
				return false;
 - 
 
1150 
		} else if (!pickupStoreId.equals(other.pickupStoreId))
 - 
 
1151 
			return false;
 - 
 
1152 
		if (pickupTimestamp == null) {
 - 
 
1153 
			if (other.pickupTimestamp != null)
 - 
 
1154 
				return false;
 - 
 
1155 
		} else if (!pickupTimestamp.equals(other.pickupTimestamp))
 - 
 
1156 
			return false;
 - 
 
1157 
		if (previousStatus == null) {
 - 
 
1158 
			if (other.previousStatus != null)
 - 
 
1159 
				return false;
 - 
 
1160 
		} else if (!previousStatus.equals(other.previousStatus))
 - 
 
1161 
			return false;
 - 
 
1162 
		if (productCondition == null) {
 - 
 
1163 
			if (other.productCondition != null)
 - 
 
1164 
				return false;
 - 
 
1165 
		} else if (!productCondition.equals(other.productCondition))
 - 
 
1166 
			return false;
 - 
 
1167 
		if (promisedDeliveryTime == null) {
 - 
 
1168 
			if (other.promisedDeliveryTime != null)
 - 
 
1169 
				return false;
 - 
 
1170 
		} else if (!promisedDeliveryTime.equals(other.promisedDeliveryTime))
 - 
 
1171 
			return false;
 - 
 
1172 
		if (promisedShippingTime == null) {
 - 
 
1173 
			if (other.promisedShippingTime != null)
 - 
 
1174 
				return false;
 - 
 
1175 
		} else if (!promisedShippingTime.equals(other.promisedShippingTime))
 - 
 
1176 
			return false;
 - 
 
1177 
		if (purchaseOrderId == null) {
 - 
 
1178 
			if (other.purchaseOrderId != null)
 - 
 
1179 
				return false;
 - 
 
1180 
		} else if (!purchaseOrderId.equals(other.purchaseOrderId))
 - 
 
1181 
			return false;
 - 
 
1182 
		if (reShipTimestamp == null) {
 - 
 
1183 
			if (other.reShipTimestamp != null)
 - 
 
1184 
				return false;
 - 
 
1185 
		} else if (!reShipTimestamp.equals(other.reShipTimestamp))
 - 
 
1186 
			return false;
 - 
 
1187 
		if (reachedDestinationTimestamp == null) {
 - 
 
1188 
			if (other.reachedDestinationTimestamp != null)
 - 
 
1189 
				return false;
 - 
 
1190 
		} else if (!reachedDestinationTimestamp.equals(other.reachedDestinationTimestamp))
 - 
 
1191 
			return false;
 - 
 
1192 
		if (receiver == null) {
 - 
 
1193 
			if (other.receiver != null)
 - 
 
1194 
				return false;
 - 
 
1195 
		} else if (!receiver.equals(other.receiver))
 - 
 
1196 
			return false;
 - 
 
1197 
		if (receiverReturnTimestamp == null) {
 - 
 
1198 
			if (other.receiverReturnTimestamp != null)
 - 
 
1199 
				return false;
 - 
 
1200 
		} else if (!receiverReturnTimestamp.equals(other.receiverReturnTimestamp))
 - 
 
1201 
			return false;
 - 
 
1202 
		if (refundBy == null) {
 - 
 
1203 
			if (other.refundBy != null)
 - 
 
1204 
				return false;
 - 
 
1205 
		} else if (!refundBy.equals(other.refundBy))
 - 
 
1206 
			return false;
 - 
 
1207 
		if (refundReason == null) {
 - 
 
1208 
			if (other.refundReason != null)
 - 
 
1209 
				return false;
 - 
 
1210 
		} else if (!refundReason.equals(other.refundReason))
 - 
 
1211 
			return false;
 - 
 
1212 
		if (refundTimestamp == null) {
 - 
 
1213 
			if (other.refundTimestamp != null)
 - 
 
1214 
				return false;
 - 
 
1215 
		} else if (!refundTimestamp.equals(other.refundTimestamp))
 - 
 
1216 
			return false;
 - 
 
1217 
		if (retailerAddress1 == null) {
 - 
 
1218 
			if (other.retailerAddress1 != null)
 - 
 
1219 
				return false;
 - 
 
1220 
		} else if (!retailerAddress1.equals(other.retailerAddress1))
 - 
 
1221 
			return false;
 - 
 
1222 
		if (retailerAddress2 == null) {
 - 
 
1223 
			if (other.retailerAddress2 != null)
 - 
 
1224 
				return false;
 - 
 
1225 
		} else if (!retailerAddress2.equals(other.retailerAddress2))
 - 
 
1226 
			return false;
 - 
 
1227 
		if (retailerCity == null) {
 - 
 
1228 
			if (other.retailerCity != null)
 - 
 
1229 
				return false;
 - 
 
1230 
		} else if (!retailerCity.equals(other.retailerCity))
 - 
 
1231 
			return false;
 - 
 
1232 
		if (retailerEmailId == null) {
 - 
 
1233 
			if (other.retailerEmailId != null)
 - 
 
1234 
				return false;
 - 
 
1235 
		} else if (!retailerEmailId.equals(other.retailerEmailId))
 - 
 
1236 
			return false;
 - 
 
1237 
		if (retailerId == null) {
 - 
 
1238 
			if (other.retailerId != null)
 - 
 
1239 
				return false;
 - 
 
1240 
		} else if (!retailerId.equals(other.retailerId))
 - 
 
1241 
			return false;
 - 
 
1242 
		if (retailerMobileNumber == null) {
 - 
 
1243 
			if (other.retailerMobileNumber != null)
 - 
 
1244 
				return false;
 - 
 
1245 
		} else if (!retailerMobileNumber.equals(other.retailerMobileNumber))
 - 
 
1246 
			return false;
 - 
 
1247 
		if (retailerName == null) {
 - 
 
1248 
			if (other.retailerName != null)
 - 
 
1249 
				return false;
 - 
 
1250 
		} else if (!retailerName.equals(other.retailerName))
 - 
 
1251 
			return false;
 - 
 
1252 
		if (retailerPinCode == null) {
 - 
 
1253 
			if (other.retailerPinCode != null)
 - 
 
1254 
				return false;
 - 
 
1255 
		} else if (!retailerPinCode.equals(other.retailerPinCode))
 - 
 
1256 
			return false;
 - 
 
1257 
		if (retailerState == null) {
 - 
 
1258 
			if (other.retailerState != null)
 - 
 
1259 
				return false;
 - 
 
1260 
		} else if (!retailerState.equals(other.retailerState))
 - 
 
1261 
			return false;
 - 
 
1262 
		if (sellerId == null) {
 - 
 
1263 
			if (other.sellerId != null)
 - 
 
1264 
				return false;
 - 
 
1265 
		} else if (!sellerId.equals(other.sellerId))
 - 
 
1266 
			return false;
 - 
 
1267 
		if (serialNumber == null) {
 - 
 
1268 
			if (other.serialNumber != null)
 - 
 
1269 
				return false;
 - 
 
1270 
		} else if (!serialNumber.equals(other.serialNumber))
 - 
 
1271 
			return false;
 - 
 
1272 
		if (shippingCost == null) {
 - 
 
1273 
			if (other.shippingCost != null)
 - 
 
1274 
				return false;
 - 
 
1275 
		} else if (!shippingCost.equals(other.shippingCost))
 - 
 
1276 
			return false;
 - 
 
1277 
		if (shippingRefund == null) {
 - 
 
1278 
			if (other.shippingRefund != null)
 - 
 
1279 
				return false;
 - 
 
1280 
		} else if (!shippingRefund.equals(other.shippingRefund))
 - 
 
1281 
			return false;
 - 
 
1282 
		if (shippingTimestamp == null) {
 - 
 
1283 
			if (other.shippingTimestamp != null)
 - 
 
1284 
				return false;
 - 
 
1285 
		} else if (!shippingTimestamp.equals(other.shippingTimestamp))
 - 
 
1286 
			return false;
 - 
 
1287 
		if (source == null) {
 - 
 
1288 
			if (other.source != null)
 - 
 
1289 
				return false;
 - 
 
1290 
		} else if (!source.equals(other.source))
 - 
 
1291 
			return false;
 - 
 
1292 
		if (status != other.status)
 - 
 
1293 
			return false;
 - 
 
1294 
		if (statusDescription == null) {
 - 
 
1295 
			if (other.statusDescription != null)
 - 
 
1296 
				return false;
 - 
 
1297 
		} else if (!statusDescription.equals(other.statusDescription))
 - 
 
1298 
			return false;
 - 
 
1299 
		if (storeId == null) {
 - 
 
1300 
			if (other.storeId != null)
 - 
 
1301 
				return false;
 - 
 
1302 
		} else if (!storeId.equals(other.storeId))
 - 
 
1303 
			return false;
 - 
 
1304 
		if (taxType != other.taxType)
 - 
 
1305 
			return false;
 - 
 
1306 
		if (totalAmount == null) {
 - 
 
1307 
			if (other.totalAmount != null)
 - 
 
1308 
				return false;
 - 
 
1309 
		} else if (!totalAmount.equals(other.totalAmount))
 - 
 
1310 
			return false;
 - 
 
1311 
		if (totalWeight == null) {
 - 
 
1312 
			if (other.totalWeight != null)
 - 
 
1313 
				return false;
 - 
 
1314 
		} else if (!totalWeight.equals(other.totalWeight))
 - 
 
1315 
			return false;
 - 
 
1316 
		if (trackingId == null) {
 - 
 
1317 
			if (other.trackingId != null)
 - 
 
1318 
				return false;
 - 
 
1319 
		} else if (!trackingId.equals(other.trackingId))
 - 
 
1320 
			return false;
 - 
 
1321 
		if (transactionId == null) {
 - 
 
1322 
			if (other.transactionId != null)
 - 
 
1323 
				return false;
 - 
 
1324 
		} else if (!transactionId.equals(other.transactionId))
 - 
 
1325 
			return false;
 - 
 
1326 
		if (vendorId == null) {
 - 
 
1327 
			if (other.vendorId != null)
 - 
 
1328 
				return false;
 - 
 
1329 
		} else if (!vendorId.equals(other.vendorId))
 - 
 
1330 
			return false;
 - 
 
1331 
		if (vendorPaid == null) {
 - 
 
1332 
			if (other.vendorPaid != null)
 - 
 
1333 
				return false;
 - 
 
1334 
		} else if (!vendorPaid.equals(other.vendorPaid))
 - 
 
1335 
			return false;
 - 
 
1336 
		if (verificationTimestamp == null) {
 - 
 
1337 
			if (other.verificationTimestamp != null)
 - 
 
1338 
				return false;
 - 
 
1339 
		} else if (!verificationTimestamp.equals(other.verificationTimestamp))
 - 
 
1340 
			return false;
 - 
 
1341 
		if (walletAmount == null) {
 - 
 
1342 
			if (other.walletAmount != null)
 - 
 
1343 
				return false;
 - 
 
1344 
		} else if (!walletAmount.equals(other.walletAmount))
 - 
 
1345 
			return false;
 - 
 
1346 
		if (warehouseAddressId == null) {
 - 
 
1347 
			if (other.warehouseAddressId != null)
 - 
 
1348 
				return false;
 - 
 
1349 
		} else if (!warehouseAddressId.equals(other.warehouseAddressId))
 - 
 
1350 
			return false;
 - 
 
1351 
		if (warehouseId == null) {
 - 
 
1352 
			if (other.warehouseId != null)
 - 
 
1353 
				return false;
 - 
 
1354 
		} else if (!warehouseId.equals(other.warehouseId))
 - 
 
1355 
			return false;
 - 
 
1356 
		return true;
 884 
		return true;
1357 
	}
 885 
	}
1358 
	@Override
 886 
	@Override
1359 
	public String toString() {
 887 
	public String toString() {
1360 
		return "Order [id=" + id + ", warehouseId=" + warehouseId + ", sellerId=" + sellerId + ", warehouseAddressId="
 888 
		return "Order [id=" + id + ", warehouseId=" + warehouseId + ", sellerId=" + sellerId + ", warehouseAddressId="