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

  * @author ashikali
  */
 @Entity
 @Table(name = "transaction.`order`", schema = "transaction")
-@NamedQueries({ @NamedQuery(name = "Order.selectAll", query = "select o from Order o"),
+@NamedQueries({@NamedQuery(name = "Order.selectAll", query = "select o from Order o"),
 		@NamedQuery(name = "Order.selectById", query = "select o from Order o where o.id= :id"),
 		@NamedQuery(name = "Order.selectByTransactionId", query = "select t.id, t.createTimestamp, o.retailerAddress1, o.retailerAddress2, o.retailerCity, "
 				+ "o.retailerPinCode, o.retailerState, o.shippingCost, o.statusDescription, o.invoiceNumber, o.airwayBillNumber, o.totalAmount, li.brand, li.modelName, "
 				+ "li.modelNumber, li.color, li.quantity, li.unitPrice, p.id, p.name,  o.shippingTimestamp, o.status, o.promisedDeliveryTime, o.retailerName, t.status, i.catalogItemId  from Transaction t join Order o on o.transactionId = t.id "
 				+ "join LineItem li on li.orderId = o.id left join Provider p on p.id = o.logisticsProviderId join Item i on i.id=li.itemId where o.transactionId = :transactionId"),
 				+ " sum(case when concat(year(o.billingTimestamp), month(o.billingTimestamp))= :mtd  then li.quantity else 0 end),"
 				+ "	sum(case when o.billingTimestamp between  :lmtdStartDate and :lmtdEndDate then li.quantity else 0 end),"
 				+ "	sum(case when o.billingTimestamp between  :lmtdStartDate and :lmsEndDate  then li.quantity else 0 end)"
 				+ " )"
 				+ "	 from Order o join LineItem li on o.id = li.orderId join FofoStore fs on fs.id = o.retailerId where o.status in (7,9,10,12)"
-				+ "	and o.billingTimestamp >= :lmtdStartDate and fs.warehouseId in :warehouseId and fs.internal = 0 group by li.brand"),
+				+ "	and o.billingTimestamp >= :lmtdStartDate and fs.warehouseId in :warehouseId and fs.internal = false group by li.brand"),
 		@NamedQuery(name = "Order.selectAllBilledOrderGroupByBrandFofoId", query = "select new com.spice.profitmandi.dao.model.BrandWiseModel(li.brand,"
 				+ "	DATE_FORMAT(o.billingTimestamp, '%m-%Y'),sum(cast(o.totalAmount AS integer)))"
 				+ "	 from Order o join LineItem li on o.id = li.orderId join FofoStore fs on fs.id = o.retailerId where o.status in (7,9,10,12)"
 				+ "	and o.billingTimestamp >= :startDate and o.retailerId =:fofoId  group by li.brand,DATE_FORMAT(o.billingTimestamp, '%m-%Y')"),
 				+ "	and o.billingTimestamp >= :startDate and  o.billingTimestamp < :endDate and (null is :brand or li.brand = :brand) and fs.internal = 0 group by fs.warehouseId, date(o.billingTimestamp), li.brand"),
 		@NamedQuery(name = "Order.selectAllBilledOrderItemByBrand", query = "select new com.spice.profitmandi.dao.model.SecondaryOrderItemBillingModel(o.retailerName,li.brand,i.modelName, "
 				+ " i.modelNumber, i.color," + "o.totalAmount," + "	 li.quantity)"
 				+ "	 from Order o join LineItem li on o.id = li.orderId join Item i on i.id = li.itemId join FofoStore fs on fs.id = o.retailerId where o.status in (7,9,10,12)"
-				+ "	and date(o.billingTimestamp) in :date and fs.warehouseId in :warehouseId and li.brand = :brand and fs.internal = 0 order by li.itemId desc"),
+				+ "	and date(o.billingTimestamp) in :date and fs.warehouseId in :warehouseId and li.brand = :brand and fs.internal = false order by li.itemId desc"),
 		@NamedQuery(name = "Order.selectTodayBilledOrderItemByBrand", query = "select new com.spice.profitmandi.dao.model.SecondaryOrderItemBillingModel(o.retailerName,li.brand,i.modelName, "
 				+ " i.modelNumber, i.color," + "o.totalAmount," + "	 li.quantity)"
 				+ "	 from Order o join LineItem li on o.id = li.orderId join Item i on i.id = li.itemId join FofoStore fs on fs.id = o.retailerId where o.status in (7,9,10,12)"
 				+ "	and o.billingTimestamp >= :startDate and fs.warehouseId in :warehouseId and li.brand in :brand order by li.itemId desc"),
 				+ "	and o.billingTimestamp >= :startDate and o.billingTimestamp <= :endDate and o.retailerId = :fofoId  group by i.id"),
 		@NamedQuery(name = "Order.selectAllGrnPendingOrderByCatalogId", query = "select new com.spice.profitmandi.dao.model.FofoIdQtyModel("
 				+ "  fs.warehouseId,fs.id,sum(li.quantity )) from FofoStore fs join  Order o on fs.id = o.retailerId "
 				+ "  join LineItem li on o.id = li.orderId  join TagListing tl on tl.itemId = li.itemId "
-				+ "  join Item i on (i.id = tl.itemId ) where " + "	 fs.active = 1 and fs.internal = 0 and"
+				+ "  join Item i on (i.id = tl.itemId ) where " + "	 fs.active = false and fs.internal = true and"
 				+ "  o.billingTimestamp is not null and o.refundTimestamp is null and o.partnerGrnTimestamp is null"
 				+ "  and i.catalogItemId in :catalogItemId group by fs.id"),
 		@NamedQuery(name = "Order.selectAllPendingIndentOrderByCatalogId", query = "select new com.spice.profitmandi.dao.model.FofoIdQtyModel("
 				+ "  fs.warehouseId,fs.id,sum(case when li.quantity is null then 0 else  li.quantity end))"
 				+ "	 from FofoStore fs  join  Order o on fs.id = o.retailerId"
 				+ "  join LineItem li on o.id = li.orderId " + "  join TagListing tl on tl.itemId = li.itemId "
 				+ "  join Item i on i.id = tl.itemId  where "
-				+ "	 fs.active = 1 and fs.internal = 0 and o.status in (3,4) and i.catalogItemId in :catalogItemId group by fs.id"),
+				+ "	 fs.active = false and fs.internal = true and o.status in (3,4) and i.catalogItemId in :catalogItemId group by fs.id"),
 		@NamedQuery(name = "Order.selectGrnPendingOrdersByCatalogId", query = "select new com.spice.profitmandi.dao.model.FofoIdCatalogQtyModel("
 				+ "  fs.warehouseId,fs.id,i.catalogItemId,sum(li.quantity )) from FofoStore fs join  Order o on fs.id = o.retailerId "
 				+ "  join LineItem li on o.id = li.orderId  join TagListing tl on tl.itemId = li.itemId "
-				+ "  join Item i on (i.id = tl.itemId ) where " + "	 fs.active = 1 and fs.internal = 0 and"
+				+ "  join Item i on (i.id = tl.itemId ) where " + "	 fs.active = true and fs.internal = false and"
 				+ "  o.billingTimestamp is not null and o.refundTimestamp is null and o.partnerGrnTimestamp is null"
 				+ "  and i.catalogItemId in :catalogItemId and fs.warehouseId in :warehouseId group by i.catalogItemId, fs.id"),
 		@NamedQuery(name = "Order.selectPendingIndentOrdersByCatalogId", query = "select new com.spice.profitmandi.dao.model.FofoIdCatalogQtyModel("
 				+ "  fs.warehouseId,fs.id,i.catalogItemId,sum(case when li.quantity is null then 0 else  li.quantity end))"
 				+ "	 from FofoStore fs  join  Order o on fs.id = o.retailerId"
 				+ "  join LineItem li on o.id = li.orderId " + "  join TagListing tl on tl.itemId = li.itemId "
 				+ "  join Item i on i.id = tl.itemId  where "
-				+ "	 fs.active = 1 and fs.internal = 0 and o.status in (3,4) and i.catalogItemId in :catalogItemId and fs.warehouseId in :warehouseId group by i.catalogItemId, fs.id"),
+				+ "	 fs.active = true and fs.internal = false and o.status in (3,4) and i.catalogItemId in :catalogItemId and fs.warehouseId in :warehouseId group by i.catalogItemId, fs.id"),
 		@NamedQuery(name = "Order.selectFirstBilling", query = "select new com.spice.profitmandi.dao.model.FofoFirstBillingModel(fs.id, min(o.billingTimestamp) )"
-				+ "	 from FofoStore fs  join  Order o on fs.id = o.retailerId" + " group by fs.id"),
+				+ "	from FofoStore fs  join  Order o on fs.id = o.retailerId  group by fs.id"),
 		@NamedQuery(name = "Order.selectAllGrnPendingOrderByRange", query = "select new com.spice.profitmandi.dao.model.FofoIdItemDetailModel("
 				+ "  fs.warehouseId,fs.id,sum(li.quantity ),i.brand,i.modelName,i.modelNumber,i.catalogItemId) from FofoStore fs join  Order o on fs.id = o.retailerId "
 				+ "  join LineItem li on o.id = li.orderId  join TagListing tl on tl.itemId = li.itemId "
-				+ "  join Item i on (i.id = tl.itemId ) where " + "	 fs.active = 1 and fs.internal = 0 and"
+				+ "  join Item i on (i.id = tl.itemId ) where fs.active = true and fs.internal = false and"
 				+ "  o.billingTimestamp is not null and o.refundTimestamp is null and o.partnerGrnTimestamp is null"
 				+ "  and tl.mop between :startPrice and :endPrice and i.categoryId=10006 group by fs.id,i.catalogItemId,i.brand,i.modelName,i.modelNumber"),
 		@NamedQuery(name = "Order.selectAllPendingIndentOrderByRange", query = "select new com.spice.profitmandi.dao.model.FofoIdItemDetailModel("
 				+ "  fs.warehouseId, fs.id,sum(case when li.quantity is null then 0 else  li.quantity end),i.brand,i.modelName,i.modelNumber,i.catalogItemId)"
 				+ "	 from FofoStore fs  join  Order o on fs.id = o.retailerId"
 				+ "  join LineItem li on o.id = li.orderId " + "  join TagListing tl on tl.itemId = li.itemId "
 				+ "  join Item i on i.id = tl.itemId  where "
-				+ "	 fs.active = 1 and fs.internal = 0 and o.status in (3,4) and tl.mop between :startPrice and :endPrice  and i.categoryId=10006 group by fs.id,i.catalogItemId,i.brand,i.modelName,i.modelNumber"),
+				+ "	 fs.active = true and fs.internal = false and o.status in (3,4) and tl.mop between :startPrice and :endPrice  and i.categoryId=10006 group by fs.id,i.catalogItemId,i.brand,i.modelName,i.modelNumber"),
 		@NamedQuery(name = "Order.selectAllGrnPendingOrderItemByCatalogIdFofoId", query = "select new com.spice.profitmandi.dao.model.FofoIdItemDetailModel("
 				+ "  fs.warehouseId, fs.id, sum(li.quantity), i.brand, i.modelName, i.modelNumber, i.catalogItemId) from FofoStore fs join  Order o on fs.id = o.retailerId "
 				+ "  join LineItem li on o.id = li.orderId  join TagListing tl on tl.itemId = li.itemId "
-				+ "  join Item i on (i.id = tl.itemId ) where " + "	 fs.active = true and fs.internal = 0 and"
+				+ "  join Item i on (i.id = tl.itemId ) where " + "	 fs.active = true and fs.internal = false and"
 				+ "  o.billingTimestamp is not null and o.refundTimestamp is null and o.partnerGrnTimestamp is null"
 				+ "  and i.catalogItemId in :catalogItemId and  i.categoryId=10006 and fs.id = :fofoId group by i.catalogItemId, i.brand,i.modelName,i.modelNumber"),
 		@NamedQuery(name = "Order.selectAllPendingIndentOrderItemByCatalogIdFofoId", query = "select new com.spice.profitmandi.dao.model.FofoIdItemDetailModel("
 				+ "   fs.warehouseId, fs.id, sum(li.quantity), i.brand, i.modelName, i.modelNumber, i.catalogItemId)"
 				+ "	 from FofoStore fs  join  Order o on fs.id = o.retailerId"
 				+ "  join LineItem li on o.id = li.orderId " + "  join TagListing tl on tl.itemId = li.itemId "
 				+ "  join Item i on i.id = tl.itemId  where "
-				+ "	 fs.active = 1 and fs.internal = 0 and o.status in (3,4) and i.catalogItemId in :catalogItemId and  i.categoryId=10006 and fs.id = :fofoId group by i.catalogItemId, i.brand,i.modelName,i.modelNumber"),
+				+ "	 fs.active = true and fs.internal = false and o.status in (3,4) and i.catalogItemId in :catalogItemId and  i.categoryId=10006 and fs.id = :fofoId group by i.catalogItemId, i.brand,i.modelName,i.modelNumber"),
 		@NamedQuery(name = "Order.selectGroupByBrandLmp", query = "select new com.spice.profitmandi.dao.model.BrandWiseModel(li.brand,"
 				+ " DATE_FORMAT(o.billingTimestamp,:groupParameter ),sum(cast(o.totalAmount AS integer)))"
 				+ "	 from Order o join LineItem li on o.id = li.orderId join FofoStore fs on fs.id = o.retailerId where o.status in (7,9,10,12)"
-				+ "	and (o.billingTimestamp between :lmsStartDate and :endDate) and fs.id in :fofoId and fs.warehouseId in :warehouseId and fs.internal = 0 group by li.brand,DATE_FORMAT(o.billingTimestamp, :groupParameter)"),
+				+ "	and (o.billingTimestamp between :lmsStartDate and :endDate) and fs.id in :fofoId and fs.warehouseId in :warehouseId and fs.internal = false group by li.brand,DATE_FORMAT(o.billingTimestamp, :groupParameter)"),
 		@NamedQuery(name = "Order.selectGrnPendingOrderQtyByCatalogId", query = "select sum(case when li.quantity is null then 0 else  li.quantity end)"
 				+ "  from FofoStore fs join  Order o on fs.id = o.retailerId "
 				+ "  join LineItem li on o.id = li.orderId  join TagListing tl on tl.itemId = li.itemId "
-				+ "  join Item i on (i.id = tl.itemId ) where " + "	 fs.active = 1 and fs.internal = 0 and"
+				+ "  join Item i on (i.id = tl.itemId ) where  fs.active = true and fs.internal = false and"
 				+ "  o.billingTimestamp is not null and o.refundTimestamp is null and o.partnerGrnTimestamp is null"
 				+ "  and i.catalogItemId = :catalogItemId and fs.id = :fofoId group by i.catalogItemId, fs.id"),
 		@NamedQuery(name = "Order.selectPendingIndentOrderQtyByCatalogId", query = "select sum(case when li.quantity is null then 0 else  li.quantity end)"
 				+ "	 from FofoStore fs  join  Order o on fs.id = o.retailerId"
 				+ "  join LineItem li on o.id = li.orderId " + "  join TagListing tl on tl.itemId = li.itemId "
 				+ "  join Item i on i.id = tl.itemId  where "
-				+ "	 fs.active = 1 and fs.internal = 0 and o.status in (3,4)and i.catalogItemId = :catalogItemId and fs.id = :fofoId group by i.catalogItemId, fs.id"),
+				+ "	 fs.active = true and fs.internal = false and o.status in (3,4)and i.catalogItemId = :catalogItemId and fs.id = :fofoId group by i.catalogItemId, fs.id"),
 		@NamedQuery(name = "Order.selectTodayOrders", query = "select new com.spice.profitmandi.dao.model.BrandRegionPOModel("
 				+ " case when (pr.regionId is not null) then pr.regionId else fs.warehouseId end  , li.brand, "
 				+ " sum(case when (o.createTimestamp between :startDate and :endDate) then cast(o.totalAmount AS integer ) else 0 end),"
 				+ " sum(case when (o.billingTimestamp is not null and (o.createTimestamp between :startDate and :endDate)) then cast(o.totalAmount AS integer) else 0 end),"
 				+ " sum(case when o.billingTimestamp is not null then cast(o.totalAmount AS integer ) else 0 end))"
 				+ "	from Order o join LineItem li on o.id = li.orderId join FofoStore fs on fs.id = o.retailerId"
 				+ " left join PartnerRegion pr on pr.fofoId=o.retailerId and pr.regionId=18"
-				+ " where o.refundTimestamp is null and ((o.createTimestamp between :startDate and :endDate) or (o.billingTimestamp between :startDate and :endDate)) and fs.internal = 0 and li.brand not in ('Smartdukaan','Dummy')"
+				+ " where o.refundTimestamp is null and ((o.createTimestamp between :startDate and :endDate) or (o.billingTimestamp between :startDate and :endDate)) and fs.internal = false and li.brand not in ('Smartdukaan','Dummy')"
 				+ " group by case when (pr.regionId is not null) then pr.regionId else fs.warehouseId end, li.brand"),
 		@NamedQuery(name = "Order.selectAllPendingIndentAccessoriesTvGroupByFofoId", query = "select new com.spice.profitmandi.dao.model.InStockAccessoriesTvFofoIdModel("
 				+ "  o.retailerId, SUM(case when c.parentCategoryId  = 10011 then CAST(o.totalAmount  AS integer) else 0 end), SUM(case when c.parentCategoryId  = 14200 then  CAST(o.totalAmount  AS integer) else 0 end))"
 				+ "	 from  Order o join LineItem li on o.id = li.orderId join Item i on i.id = li.itemId  join Category c on c.id = i.categoryId "
 		@NamedQuery(name = "Order.selectAllGrnPendingAccessoriesTvGroupByFofoId", query = "select new com.spice.profitmandi.dao.model.InStockAccessoriesTvFofoIdModel("
 				+ "  o.retailerId, SUM(case when c.parentCategoryId  = 10011 then CAST(o.totalAmount  AS integer) else 0 end), SUM(case when c.parentCategoryId  = 14200 then  CAST(o.totalAmount  AS integer) else 0 end))"
 				+ "	 from  Order o join LineItem li on o.id = li.orderId join Item i on i.id = li.itemId  join Category c on c.id = i.categoryId "
 				+ "  where o.retailerId in :fofoIds and o.billingTimestamp is not null and o.refundTimestamp is null and o.partnerGrnTimestamp is null and i.categoryId != 10006 group by o.retailerId"),
+		@NamedQuery(name = "Order.selectPartnersBilledBetweenDates", query = "select new com.spice.profitmandi.dao.model.PartnerSecondaryModel(fs.warehouseId, fs.id, count(o.id), sum(o.totalAmount) )" +
+				" from FofoStore fs left join Order o on (fs.id=o.retailerId and o.billingTimestamp between :startDate and :endDate " +
+				" and o.refundTimestamp is null) where" +
+				" fs.internal = false and (fs.active= true or o.retailerId is not null)  group by fs.warehouseId, fs.id"),
 		@NamedQuery(name = "Order.selectCollectionSummary", query = "select new com.spice.profitmandi.dao.model.CollectionSummary(pot.createTimestamp, "
 				+ "  pot.referenceType,sum(case when po.name = 'CASH' then cast(pot.amount As int) else 0 end),"
 				+ "  sum(case when po.name = 'PINELABS' then cast(pot.amount As int) else 0 end),"
 				+ "  sum(case when po.name = 'BAJAJ FINSERV' then cast(pot.amount As int) else 0 end),"
 				+ "  sum(case when po.name = 'HOME CREDIT' then cast(pot.amount As int) else 0 end),"
 						@ColumnResult(name = "id", type = Integer.class),
 						@ColumnResult(name = "brand", type = String.class),
 						@ColumnResult(name = "secondary_plan", type = Long.class),
 						@ColumnResult(name = "total_price", type = Long.class),
 						@ColumnResult(name = "auth_id", type = Integer.class),
-						@ColumnResult(name = "commited_timestamp", type = LocalDateTime.class) }) }),
+						@ColumnResult(name = "commited_timestamp", type = LocalDateTime.class)})}),
 		@SqlResultSetMapping(name = "PriceDropReportModel", classes = {
 				@ConstructorResult(targetClass = PriceDropReportModel.class, columns = {
 						@ColumnResult(name = "code", type = String.class),
 						@ColumnResult(name = "id", type = Integer.class),
 						@ColumnResult(name = "amount", type = Float.class),
 						@ColumnResult(name = "partner_payout", type = Float.class),
 						@ColumnResult(name = "imei", type = String.class),
 						@ColumnResult(name = "status", type = String.class),
 						@ColumnResult(name = "update_timestamp", type = LocalDateTime.class),
-						@ColumnResult(name = "rejection_reason", type = String.class), }) })
+						@ColumnResult(name = "rejection_reason", type = String.class),})})
 })
 public class Order implements Serializable {
 	private static final long serialVersionUID = 1L;
-	public Order() {
-	}
 	@Id
 	@Column(name = "id", unique = true, updatable = false)
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	private Integer id;
 	@Column(name = "warehouse_id")
 	private Integer warehouseId;
 	@Column(name = "seller_id")
 	private Integer sellerId;
 	@Column(name = "warehouse_address_id")
 	private Integer warehouseAddressId;
 	@Column(name = "logistics_provider_id")
 	private Integer logisticsProviderId;
 	@Column(name = "airwaybill_no", length = 50)
 	private String airwayBillNumber;
 	@Column(name = "tracking_id", length = 50)
 	private String trackingId;
 	@Convert(converter = LocalDateTimeAttributeConverter.class)
 	@Column(name = "expected_delivery_time")
 	private LocalDateTime expectedDeliveryTime;
 	@Convert(converter = LocalDateTimeAttributeConverter.class)
 	@Column(name = "promised_delivery_time")
 	private LocalDateTime promisedDeliveryTime;
 	@Convert(converter = LocalDateTimeAttributeConverter.class)
 	@Column(name = "expected_shipping_time")
 	private LocalDateTime expectedShippingTime;
 	@Convert(converter = LocalDateTimeAttributeConverter.class)
 	@Column(name = "promised_shipping_time")
 	private LocalDateTime promisedShippingTime;
 	@Convert(converter = LocalDateTimeAttributeConverter.class)
 	@Column(name = "partner_grn_timestamp")
 	private LocalDateTime partnerGrnTimestamp;
-	public LocalDateTime getPartnerGrnTimestamp() {
-		return partnerGrnTimestamp;
-	}
-	public void setPartnerGrnTimestamp(LocalDateTime partnerGrnTimestamp) {
-		this.partnerGrnTimestamp = partnerGrnTimestamp;
-	}
 	@Transient
 	private List<String> returnedImeis;
-	public List<String> getReturnedImeis() {
-		return returnedImeis;
-	}
-	public void setReturnedImeis(List<String> returnedImeis) {
-		this.returnedImeis = returnedImeis;
-	}
 	@Column(name = "customer_id")
 	private Integer retailerId;
 	@Column(name = "customer_name", length = 50)
 	private String retailerName;
 	@Column(name = "customer_mobilenumber", length = 20)
 	private String retailerMobileNumber;
 	@Column(name = "customer_pincode", length = 10)
 	private String retailerPinCode;
 	@Column(name = "customer_address1", length = 100)
 	private String retailerAddress1;
 	@Column(name = "customer_address2", length = 100)
 	private String retailerAddress2;
 	@Column(name = "customer_city", length = 100)
 	private String retailerCity;
 	@Column(name = "customer_state", length = 100)
 	private String retailerState;
 	@Column(name = "customer_email", length = 50)
 	private String retailerEmailId;
 	@Column(name = "status")
 	@Enumerated(EnumType.ORDINAL)
 	private OrderStatus status;
 	@Column(name = "statusDescription", length = 50)
 	private String statusDescription;
 	@Column(name = "total_amount")
 	private Float totalAmount;
 	@Column(name = "gvAmount")
 	private Float gvAmount;
 	@Column(name = "total_weight")
 	private Float totalWeight;
 	@Column(name = "invoice_number", length = 30)
 	private String invoiceNumber;
 	@Column(name = "billed_by", length = 30)
 	private String billedBy;
 	@Convert(converter = LocalDateTimeAttributeConverter.class)
 	@Column(name = "created_timestamp")
 	private LocalDateTime createTimestamp;
 	@Convert(converter = LocalDateTimeAttributeConverter.class)
 	@Column(name = "accepted_timestamp")
 	private LocalDateTime acceptedTimestamp;
 	@Convert(converter = LocalDateTimeAttributeConverter.class)
 	@Column(name = "billing_timestamp")
 	private LocalDateTime billingTimestamp;
 	@Convert(converter = LocalDateTimeAttributeConverter.class)
 	@Column(name = "shipping_timestamp")
 	private LocalDateTime shippingTimestamp;
 	@Convert(converter = LocalDateTimeAttributeConverter.class)
 	@Column(name = "pickup_timestamp")
 	private LocalDateTime pickupTimestamp;
 	@Convert(converter = LocalDateTimeAttributeConverter.class)
 	@Column(name = "delivery_timestamp")
 	private LocalDateTime deliveryTimestamp;
 	@Convert(converter = LocalDateTimeAttributeConverter.class)
 	@Column(name = "outofstock_timestamp")
 	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 Integer batchNumber;
 	@Column(name = "serialNo")
 	private Integer serialNumber;
 	@Column(name = "doaFlag", columnDefinition = "tinyInteger(1) default 0")
 	private Boolean doaFlag;
 	@Column(name = "pickupRequestNo")
 	private Integer pickupRequestNumber;
+	/*
+	 * @Column(name = "jacket_number", length = 10) private Integer jacketNumber;
+	 */
 	@Column(name = "new_order_id")
 	private Integer newOrderId;
 	@Column(name = "doa_auth_timestamp")
 	private LocalDateTime doaAuthTimestamp;
 	@Convert(converter = LocalDateTimeAttributeConverter.class)
 	@Column(name = "doa_pickup_timestamp")
 	private LocalDateTime doaPickupTimestamp;
 	@Convert(converter = LocalDateTimeAttributeConverter.class)
 	@Column(name = "received_return_timestamp")
 	private LocalDateTime receiverReturnTimestamp;
 	@Convert(converter = LocalDateTimeAttributeConverter.class)
 	@Column(name = "reship_timestamp")
 	private LocalDateTime reShipTimestamp;
 	@Convert(converter = LocalDateTimeAttributeConverter.class)
 	@Column(name = "refund_timestamp")
 	private LocalDateTime refundTimestamp;
 	@Column(name = "purchase_order_id")
 	private Integer purchaseOrderId;
 	@Column(name = "cod", columnDefinition = "tinyInteger(1) default 0")
 	private Boolean cod;
 	@Convert(converter = LocalDateTimeAttributeConverter.class)
 	@Column(name = "verification_timestamp")
 	private LocalDateTime verificationTimestamp;
 	@Column(name = "refunded_by", length = 30)
 	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;
 	private Integer previousStatus;
 	@Column(name = "vendorId")
 	private Integer vendorId;
 	@Column(name = "delayReasonText", length = 250)
 	private String delayReasonText;
 	@Column(name = "doa_logistics_provider_id")
 	private Integer doaLogisticsProviderId;
+	/*
+	 * @Column(name = "delay_reason") private DelayReason delayReason;
+	 */
 	@Column(name = "vendor_paid", columnDefinition = "tinyInteger(1) default 0")
 	private Boolean vendorPaid;
 	@Convert(converter = LocalDateTimeAttributeConverter.class)
 	@Column(name = "local_connected_timestamp")
 	private LocalDateTime localConnectedTimestamp;
 	@Convert(converter = LocalDateTimeAttributeConverter.class)
 	@Column(name = "reached_destination_timestamp")
 	private LocalDateTime reachedDestinationTimestamp;
 	@Convert(converter = LocalDateTimeAttributeConverter.class)
 	@Column(name = "first_dlvyatmp_timestamp")
 	private LocalDateTime firstDlvyatmpTimestamp;
 	@Column(name = "originalOrderId")
 	private Integer originalOrderId;
 	@Column(name = "fulfilmentWarehouseId")
 	private Integer fulfilmentWarehouseId;
 	@Column(name = "orderType")
 	private Integer orderType;
 	@Column(name = "pickupStoreId")
 	private Integer pickupStoreId;
 	@Column(name = "otg", columnDefinition = "tinyInteger(1) default 0")
 	private Boolean otg;
 	@Convert(converter = LocalDateTimeAttributeConverter.class)
 	@Column(name = "courier_delivery_time")
 	private LocalDateTime courierDeliveryTimestamp;
 	@Column(name = "insurer")
 	private Integer insurer;
 	@Column(name = "insuranceAmount")
 	private Float insuranceAmount;
 	@Column(name = "freebieItemId")
 	private Integer freebieItemId;
 	@Column(name = "source")
 	private Integer source;
 	@Column(name = "advanceAmount")
 	private Float advanceAmount;
 	@Column(name = "storeId")
 	private Integer storeId;
 	@Column(name = "productCondition")
 	private Integer productCondition;
 	@Column(name = "dataProtectionInsurer")
 	private Integer dataProtectionInsurer;
 	@Column(name = "dataProtectionAmount")
 	private Integer dataProtectionAmount;
 	@Column(name = "taxType")
 	@Enumerated(EnumType.ORDINAL)
 	private TaxType taxType;
 	@Column(name = "logisticsTransactionId", length = 100)
 	private String logisticsTransactionId;
 	@Column(name = "shippingCost")
 	private Float shippingCost;
 	@Column(name = "codCharges")
 	private Float codCharges;
 	@Column(name = "wallet_amount")
 	private Float walletAmount;
 	@Column(name = "net_payable_amount")
 	private Float netPayableAmount;
 	@Column(name = "shippingRefund")
 	private Float shippingRefund;
 	@Column(name = "irn_generated")
 	private Boolean irnGenerated;
 	@Column(name = "shipment_hold")
 	private Boolean shipmentHold;
 	@ManyToOne(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
 	@JoinColumn(name = "id", insertable = false, updatable = false, nullable = false, referencedColumnName = "order_id")
 	private LineItem lineItem;
+	public Order() {
+	}
+	public LocalDateTime getPartnerGrnTimestamp() {
+		return partnerGrnTimestamp;
+	}
+	public void setPartnerGrnTimestamp(LocalDateTime partnerGrnTimestamp) {
+		this.partnerGrnTimestamp = partnerGrnTimestamp;
+	}
+	public List<String> getReturnedImeis() {
+		return returnedImeis;
+	}
+	public void setReturnedImeis(List<String> returnedImeis) {
+		this.returnedImeis = returnedImeis;
+	}
 	public Integer getId() {
 		return id;
+	}
 	public void setId(Integer id) {

Subversion Repositories SmartDukaan

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