@@ -847,11 +847,11 @@ public class CartRedisServiceImpl implements CartRedisService {
+"pn.nTag&2 != 2 OR pn.nTag&1 = 1 OR GETDATE() < pn.dPromoBeginDate OR GETDATE() >= pn.dPromoEndDate";
StringsqlClear=""+"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 mmmm FROM tCart mmmm WHERE mmmm.sShopNO = '"+shopNo
+shopNo+"' )"+Util.LINE_SEPARATOR+/*"DELETE mmmm FROM tCart mmmm WHERE mmmm.sShopNO = '" + shopNo
+ "' AND NOT EXISTS ( SELECT NULL FROM tWarehouseDistrict wd, tShop s, tAgentContractWarehouse acw, tAgentContractGoods acg WHERE wd.sDistrictID = s.sDistrictID AND s.sShopNO = '"
+ shopNo
+ "' AND wd.nTag & 1 = 0 AND acw.sWarehouseNO = wd.sWarehouseNO AND acw.nTag & 1 = 0 AND acg.sAgentContractNO = acw.sAgentContractNO AND acg.nGoodsID = mmmm.nGoodsID AND acg.sAgentContractNO = mmmm.sAgentContractNO ) "