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"),
 				+ "  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"),
 		@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"
+				+ "	 from FofoStore fs  join  Order o on fs.id = o.retailerId" + " group by fs.id"),
-				+ " 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"
 				+ "  sum(case when po.name = 'SAMSUNG SURE' then cast(pot.amount As int) else 0 end),sum(cast(pot.amount As int)))"
 				+ "	 from PaymentOptionTransaction pot join PaymentOption po on pot.paymentOptionId=po.id join com.spice.profitmandi.dao.entity.user.User u on u.id=pot.fofoId"
 				+ "	 join Address a on a.id=u.addressId where 1=1 and  pot.fofoId = :fofoId and pot.createTimestamp between :startDate and :endDate "
 				+ "  group by (pot.createTimestamp), pot.referenceType "),
 })
 //@NamedNativeQuery(name = "Order.findByEmailAddress", query = "select * from transaction.`order` o where  o.id = '1694173'", resultClass = Order.class)
 @NamedNativeQueries({
 		@NamedNativeQuery(name = "selectPartnerSecondaryGroupByBrand", query = "select ifnull(a.customer_id,fs.id) as id,ifnull(a.sb,brand) as brand,a.secondary_plan,sum(a.total_price) as total_price,a.auth_id, a.commited_timestamp from "
 				+ "fofo.fofo_store fs left join (select o.customer_id , li.brand as sb, li.total_price, psp.fofo_id , psp.brand, psp.secondary_plan,psp.auth_id,psp.commited_timestamp from transaction.`order` o join transaction.lineitem li on "
 				+ "(o.id = li.order_id) left join  auth.partner_secondary_plan psp on (psp.fofo_id = o.customer_id  and date(psp.commited_timestamp) >= :startDate and "
 				+ " from transaction.price_drop pd join transaction.price_drop_imei pdi on pdi.price_drop_id = pd.id join (select catalog_item_id, brand, model_name, model_number from catalog.item group by catalog_item_id )"
 				+ " ci on ci.catalog_item_id=pd.catalog_id join fofo.fofo_store fs on fs.id=pdi.retailer_id where  pdi.retailer_id = :fofoId and pd.affected_on between :startDate and :endDate and pd.amount > 0;", resultSetMapping = "PriceDropReportModel")
 })
 @SqlResultSetMappings({
 		@SqlResultSetMapping(name = "partnerSecondaryPlanModel", classes = {
 				@ConstructorResult(targetClass = PartnerSecondaryPlanModel.class, columns = {
+						@ColumnResult(name = "id", type = Integer.class),
-						@ColumnResult(name = "id", type = Integer.class), @ColumnResult(name = "brand", type = String.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 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 Integer getId() {
 	public void setSerialNumber(Integer serialNumber) {
 		this.serialNumber = serialNumber;
+	}
+	public Boolean getShipmentHold() {
+		return shipmentHold;
+	}
+	public void setShipmentHold(Boolean shipmentHold) {
+		this.shipmentHold = shipmentHold;
+	}
 	public Boolean isDoaFlag() {
 		return doaFlag;
+	}
 	public void setDoaFlag(Boolean doaFlag) {

Subversion Repositories SmartDukaan

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