x

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

@@ -128,8 +128,13 @@ public class CartRedisServiceImpl implements CartRedisService {
 		Set<String> chooseGroups = new HashSet<String>();
 		Set<String> chooseGifts = new HashSet<String>();
 		Set<String> promosNo = new HashSet<String>();
+		boolean isOrnament = 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 nTag_CG = (Integer) data.get("nTag_CG");
 				if (nTag_CG != null && (nTag_CG & 16) == 16) {
 					data.put("published", 1);
@@ -187,6 +192,7 @@ public class CartRedisServiceImpl implements CartRedisService {
 		List<Map<String, Object>> promos = this.processPromo(shopNo, promosNo, chooseGifts, chooseGroups);
 		this.processPromoGoods(promos, shopNo);
 		rjx.set("promoData", Util.listToMM(promos, "promoNo"));
+		rjx.set("isOrnament", isOrnament);
 		this.processPayAmount(rjx);
 		this.cacheData(orgNo, shopNo, terminal, rjx);
 		return rjx;