Merge branch 'feature/xukang_20210609_麦咖啡p7v2' into qa

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CouponDiscountCalculation.java

@@ -242,25 +242,25 @@ public class CouponDiscountCalculation {
         }
 
         if(haveB3S1Fav) {
-            List<CartGoods> nowCartGoodsList = new ArrayList<>();
-            AtomicBoolean changed = new AtomicBoolean();
-            changed.set(false);
-            if(CollectionUtils.isNotEmpty(cartGoodsList)){
-                ApiLog.debug("合并买3赠1商品券 【merge-before】 : {} ", JSONObject.toJSONString(cartGoodsList));
-                cartGoodsList.forEach(newCartGood -> {
-                    int index;
-                    if ((index = nowCartGoodsList.indexOf(newCartGood)) >= 0) {
-                        changed.set(true);
-                        nowCartGoodsList.get(index).setQty(nowCartGoodsList.get(index).getQty() + newCartGood.getQty());
-                    } else {
-                        nowCartGoodsList.add(newCartGood);
-                    }
-                });
-            }
-            if(changed.get()) {
-                cartGoodsList.clear();
-                cartGoodsList.addAll(nowCartGoodsList);
-            }
+//            List<CartGoods> nowCartGoodsList = new ArrayList<>();
+//            AtomicBoolean changed = new AtomicBoolean();
+//            changed.set(false);
+//            if(CollectionUtils.isNotEmpty(cartGoodsList)){
+//                ApiLog.debug("合并买3赠1商品券 【merge-before】 : {} ", JSONObject.toJSONString(cartGoodsList));
+//                cartGoodsList.forEach(newCartGood -> {
+//                    int index;
+//                    if ((index = nowCartGoodsList.indexOf(newCartGood)) >= 0) {
+//                        changed.set(true);
+//                        nowCartGoodsList.get(index).setQty(nowCartGoodsList.get(index).getQty() + newCartGood.getQty());
+//                    } else {
+//                        nowCartGoodsList.add(newCartGood);
+//                    }
+//                });
+//            }
+//            if(changed.get()) {
+//                cartGoodsList.clear();
+//                cartGoodsList.addAll(nowCartGoodsList);
+//            }
 
             int index = 0;
             for (int i = 0; i < cartGoodsList.size(); i++) {