xxx

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

@@ -938,10 +938,10 @@ public class CartRedisServiceImpl implements CartRedisService {
 						+ "(" + sqlPromoTag + ") pn " 
 					+ "WHERE pn.nTag&2 != 2 OR pn.nTag&1 = 1 OR GETDATE() < pn.dPromoBeginDate OR GETDATE() >=  pn.dPromoEndDate";
 		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 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 + ")";
-		String sqlACart = "select * from V_Cart where sOrgNO = '" + orgNo + "' and sShopNO = '" + shopNo + "' order by nIdx";
+		String sqlACart = "select *, (case when nTag&1 = 1 or nTag&16 = 0 then 1 else 0 end) isInvalid from V_Cart where sOrgNO = '" + orgNo + "' and sShopNO = '" + shopNo + "' order by nIdx";
 
 		String sqlp = ""
 				+ "     SELECT                                                                                  "