x

src/main/java/com/egolm/shop/service/impl/CartRedisServiceImpl.java

@@ -927,6 +927,7 @@ public class CartRedisServiceImpl implements CartRedisService {
 	}
 
 	private List<Map<String, Object>> getGoodsList(String orgNo, String shopNo, String terminal) {
+		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, " 
@@ -947,7 +948,8 @@ public class CartRedisServiceImpl implements CartRedisService {
 		String sqlClear = "" 
 						//+ "DELETE mmm FROM tCart mmm WHERE mmm.sShopNO = '" + shopNo + "' AND EXISTS ( SELECT NULL FROM tAgentContractGoods nnn WHERE nnn.nGoodsID = mmm.nGoodsID AND nnn.sAgentContractNO = mmm.sAgentContractNO AND (nnn.nTag & 16 = 0 or nnn.nTag & 1 = 1) AND mmm.sShopNO = '" + shopNo + "' )" + Util.LINE_SEPARATOR 
 						+ "DELETE tCart WHERE sShopNO = '" + shopNo + "' AND nTag = 1 AND sPromoPaperNO IN (" + sqlClearPromoNo + ")" + Util.LINE_SEPARATOR 
-						+ "UPDATE tCart SET sPromoGroupNO = NULL, sPromoPaperNO = NULL WHERE sShopNO = '" + shopNo + "' AND sPromoPaperNO IN (" + sqlClearPromoNo + ")";
+						+ "UPDATE tCart SET sPromoGroupNO = NULL, sPromoPaperNO = NULL WHERE sShopNO = '" + shopNo + "' AND sPromoPaperNO IN (" + sqlClearPromoNo + ")" + Util.LINE_SEPARATOR
+						+ "UPDATE tCart SET sPromoGroupNO = NULL, sPromoPaperNO = NULL WHERE sShopNO = '" + shopNo + "' AND sPromoPaperNO IS NOT IN (" + sqlCustBwList + ")";
 		String sqlACart = "select * from V_Cart where sOrgNO = '" + orgNo + "' and sShopNO = '" + shopNo + "' order by nIdx";
 
 		String sqlp = ""