需求 #14915

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

@@ -854,16 +854,13 @@ public class CartQueryServiceImpl implements CartQueryService {
 		}
 		String sqlCustBwList = "select bw.sPromoPaperNO from tPromoCustBWList bw, tCustomer c, tShop s where bw.sShopNO = c.sCustTypeID and c.sCustNO = s.sCustNO and s.sShopNO = '" + shopNo + "'";
 		String sqlPromoTag = 
-				"SELECT " 
-					+ "c.sPromoPaperNO, " 
-					+ "p.nTag, " 
-					+ "p.dPromoBeginDate, " 
-					+ "p.dPromoEndDate " 
-						+ "FROM " 
-					+ "tCart c " 
-						+ "LEFT JOIN tYWPromoMain p ON p.sPromoPaperNO = c.sPromoPaperNO " 
-					+ "WHERE " 
-						+ "c.sShopNO = '" + shopNo + "'";
+			      "SELECT c.sPromoPaperNO, p.nTag, p.dPromoBeginDate, p.dPromoEndDate "
+			      + "FROM tCart c left join (select a.sPromoPaperNO, a.nTag, a.dPromoBeginDate, a.dPromoEndDate, b.nGoodsID "
+			      + "                        from tYWPromoMain a, tYWPromoDtl b "
+			      + "                        where a.sPromoPaperNO = b.sPromoPaperNO "
+			      + "                          and a.sPromoPaperNORuleID = b.sPromoPaperNO + isnull(convert(varchar,b.nRuleID),'') "
+			      + "                       ) p on p.sPromoPaperNO = c.sPromoPaperNO and p.nGoodsID = c.nGoodsID "
+			      + "WHERE c.sShopNO = '" + shopNo + "'";
 		String sqlClearPromoNo = 
 					"SELECT " 
 						+ "pn.sPromoPaperNO "