需求 #14897

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

@@ -225,7 +225,11 @@ 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 = ?";
@@ -411,7 +415,11 @@ public class OrderServiceImpl implements OrderService {
 		         + "pm.sPromoActionType sPromoType, "
 		         + "pm.sPromoActionTypeID sPromoTypeID "
 		         + "from tSalesOrderSubDtl sosd "
-			      + "left join tYWPromoMain pm on pm.sPromoPaperNO = sosd.sPromoPaperNO "
+		         + "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  = ?";