x

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

@@ -130,12 +130,17 @@ public class CartRedisServiceImpl implements CartRedisService {
 		Set<String> chooseGifts = new HashSet<String>();
 		Set<String> promosNo = new HashSet<String>();
 		boolean isOrnament = false;
+		boolean isInvalid = false;
 		if (datas != null && datas.size() > 0) {
 			for (Map<String, Object> data : datas) {
 				String sGoodsTag = (String)data.get("sGoodsTag");
 				if(sGoodsTag != null && sGoodsTag.contains("门店装饰")) {
 					isOrnament = true;
 				}
+				Integer invalid = (Integer)(Integer)data.get("isInvalid");
+				if(invalid == 1) {
+					isInvalid = true;
+				}
 				Integer nTag_CG = (Integer) data.get("nTag_CG");
 				if (nTag_CG != null && (nTag_CG & 16) == 16) {
 					data.put("published", 1);
@@ -194,6 +199,7 @@ public class CartRedisServiceImpl implements CartRedisService {
 		this.processPromoGoods(promos, shopNo);
 		rjx.set("promoData", Util.listToMM(promos, "promoNo"));
 		rjx.set("isOrnament", isOrnament);
+		rjx.set("isInvalid", isInvalid);
 		this.processPayAmount(rjx);
 		this.cacheData(orgNo, shopNo, terminal, rjx);
 		return rjx;
@@ -671,7 +677,6 @@ public class CartRedisServiceImpl implements CartRedisService {
 					product.put("warehouseNo", pm.get("sWarehouseNO"));
 				} else {
 					logger.error("商品资料不完整" + contractNo + "$" + goodsId);
-					throw new XException("商品已失效", 501);
 				}
 			}
 			for (Map<String, Object> product : giftList) {
@@ -689,7 +694,6 @@ public class CartRedisServiceImpl implements CartRedisService {
 					product.put("nTag", pm.get("nTag"));
 				} else {
 					logger.error("商品资料不完整" + contractNo + "$" + goodsId);
-					throw new XException("商品已失效", 501);
 				}
 			}
 			for (Map<String, Object> groupInfo : groupList) {
@@ -708,7 +712,6 @@ public class CartRedisServiceImpl implements CartRedisService {
 						product.put("warehouseNo", pm.get("sWarehouseNO"));
 					} else {
 						logger.error("商品资料不完整" + contractNo + "$" + goodsId);
-						throw new XException("商品已失效", 501);
 					}
 				}
 			}