需求 #14897

src/main/java/com/egolm/shop/api/service/impl/OrderServiceImpl.java

@@ -225,10 +225,14 @@ public class OrderServiceImpl implements OrderService {
 		if(orderMap.size() > 0) {
 			String sql2 = "select sod.*,sos.nSendQty, PromoSalePrice=CONVERT(NUMERIC(12,2),ROUND((sod.nSaleAmount)/sod.nSaleQty,2)),OriginaSaleAmount=sod.nSaleAmount+sod.nDisAmount,ISGift = sod.nTag&1,"
 			        + "   agp.sURL, pm.sPromoName, pm.sPromoTheme, pm.sPromoActionType sPromoType, pm.sPromoActionTypeID sPromoTypeID "
-			      + " from tSalesOrderDtl sod left join tYWPromoMain pm on pm.sPromoPaperNO = sod.sPromoPaperNO "
+			        + " from tSalesOrderDtl sod left join (select a.sPromoPaperNO, a.sPromoName, a.sPromoTheme, a.sPromoActionTypeID, a.sPromoActionType, b.nGoodsID " 
+			      + "                                   from tYWPromoMain a, tYWPromoDtl b " 
+			      + "                                   where a.sPromoPaperNO = b.sPromoPaperNO " 
+			      + "                                     and a.sPromoPaperNORuleID = b.sPromoPaperNO + isnull(convert(varchar,b.nRuleID),'') " 
+			      + "                                  ) pm on pm.sPromoPaperNO = sod.sPromoPaperNO and pm.nGoodsID = sod.nGoodsID "
 			      + "      left join V_GetminAgentGoodsPic agp on agp.nAgentID = sod.nAgentID and agp.nGoodsID = sod.nGoodsID and agp.sPicTypeID = 1"
-			      + "      left join tSalesOrderSubDtl sos on sos.sSalesOrderID = sod.sSalesOrderID  and sos.nGoodsID = sod.nGoodsID "
-			      + " where sod.sSalesOrderID = ?";
+			        + "      left join tSalesOrderSubDtl sos on sos.sSalesOrderID = sod.sSalesOrderID  and sos.nGoodsID = sod.nGoodsID "
+			        + " where sod.sSalesOrderID = ?";
 			orderDtlList = jdbcTemplate.queryForList(sql2, salesOrderId);
 		}
 		String sqlPay = ""
@@ -401,20 +405,24 @@ public class OrderServiceImpl implements OrderService {
 				+ "case when so.nOrderStatus&145 = 144 then '已完成' when so.nOrderStatus&145 = 128 then '配送中' when so.nOrderStatus&145 = 0 then '待发货' when so.nOrderStatus&5 = 4 then '已审核' else '未审核' end sOrderStatusText "
 				+ "from tSalesOrder so where so.sSalesOrderID = ?", subOrderMap.get("sSalesOrderID"));
 		String sql = ""
-			      + "select "
-			      + "sosd.*,  PromoSalePrice=CONVERT(NUMERIC(12,2),ROUND((sosd.nSaleAmount)/sosd.nSaleQty,2)),OriginaSaleAmount=sosd.nSaleAmount+sosd.nDisAmount,ISGift = sosd.nTag&1, "  
-			      + "sosd.nSendQty - isnull(sosd.nReturnQty,0) LeftReturnQty,  ag.nSaleUnits SaleMulti, ag.sSpec sSpec,"
-			      + "ag.sGoodTypeID GoodTypeID,  "
-			      + "agp.sURL, "
-			      + "pm.sPromoName, "
-			      + "pm.sPromoTheme, "
-			      + "pm.sPromoActionType sPromoType, "
-			      + "pm.sPromoActionTypeID sPromoTypeID "
-			      + "from tSalesOrderSubDtl sosd "
-			      + "left join tYWPromoMain pm on pm.sPromoPaperNO = sosd.sPromoPaperNO "
-			      + "left join V_GetminAgentGoodsPic agp on agp.nAgentID = sosd.nAgentID and agp.nGoodsID = sosd.nGoodsID and agp.sPicTypeID = 1 "
-			      + "left join tAgentContractGoods ag on sosd.sAgentContractNO = ag.sAgentContractNO and sosd.nGoodsID = ag.nGoodsID "
-			      + " where sosd.sSubOrderID  = ?";
+		         + "select "
+		         + "sosd.*,  PromoSalePrice=CONVERT(NUMERIC(12,2),ROUND((sosd.nSaleAmount)/sosd.nSaleQty,2)),OriginaSaleAmount=sosd.nSaleAmount+sosd.nDisAmount,ISGift = sosd.nTag&1, "  
+		         + "sosd.nSendQty - isnull(sosd.nReturnQty,0) LeftReturnQty,  ag.nSaleUnits SaleMulti, ag.sSpec sSpec,"
+		         + "ag.sGoodTypeID GoodTypeID,  "
+		         + "agp.sURL, "
+		         + "pm.sPromoName, "
+		         + "pm.sPromoTheme, "
+		         + "pm.sPromoActionType sPromoType, "
+		         + "pm.sPromoActionTypeID sPromoTypeID "
+		         + "from tSalesOrderSubDtl sosd "
+		         + "left join (select a.sPromoPaperNO, a.sPromoName, a.sPromoTheme, a.sPromoActionTypeID, a.sPromoActionType, b.nGoodsID " 
+		        + "                                   from tYWPromoMain a, tYWPromoDtl b "
+		        + "                                   where a.sPromoPaperNO = b.sPromoPaperNO " 
+		        + "                                     and a.sPromoPaperNORuleID = b.sPromoPaperNO + isnull(convert(varchar,b.nRuleID),'') " 
+		        + "                                  ) pm on pm.sPromoPaperNO = sosd.sPromoPaperNO and pm.nGoodsID = sosd.nGoodsID "
+		         + "left join V_GetminAgentGoodsPic agp on agp.nAgentID = sosd.nAgentID and agp.nGoodsID = sosd.nGoodsID and agp.sPicTypeID = 1 "
+		         + "left join tAgentContractGoods ag on sosd.sAgentContractNO = ag.sAgentContractNO and sosd.nGoodsID = ag.nGoodsID "
+		         + " where sosd.sSubOrderID  = ?";
 		List<Map<String, Object>> dtlList = jdbcTemplate.queryForList(sql, subOrderID);
 		Map<String, Object> deliver = jdbcTemplate.queryForMap("SELECT sum(a.nNum) nTotalCount, sum(a.nPrice * a.nNum) nTotalAmount FROM tSalesOrderDeliverSubDtl a where	a.sSubOrderID = ?", subOrderID);
 		String sql3 = "select sSubOrderID, nOrderMoney, sAocOrderID, sAocOrderNumber, nOrderNum, nPickupNum, sExpressNO, sExpressName from tSalesOrderDeliverSub where nTag&1 = 0 and  sSubOrderID = ?";