Merge remote-tracking branch 'origin/qa' into qa

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

@@ -344,28 +344,28 @@ public class CouponDiscountCalculation {
                     productList.add(couponProductVo);
                 }
 
-                if (CollectionUtils.isNotEmpty(cartGood.getProductComboList())) {
-                    cartGood.getProductComboList().forEach(comboxGoods -> {
-                        CouponProductVo couponProductVo = new CouponProductVo();
-                        couponProductVo.setAmount(Integer.valueOf(comboxGoods.getAmount().toString()));
-                        couponProductVo.setKeyProductCode(comboxGoods.getCustomerCode());
-                        couponProductVo.setQuantity(comboxGoods.getQty());
-                        couponProductVo.setProductId(comboxGoods.getGoodsId());
-                        couponProductVo.setCategoryCode(null);
-                        productList.add(couponProductVo);
-                    });
-                }
-                if (CollectionUtils.isNotEmpty(cartGood.getProductGroupList())) {
-                    cartGood.getProductGroupList().forEach(comboxGoods -> {
-                        CouponProductVo couponProductVo = new CouponProductVo();
-                        couponProductVo.setAmount(Integer.valueOf(comboxGoods.getAmount().toString()));
-                        couponProductVo.setKeyProductCode(comboxGoods.getCustomerCode());
-                        couponProductVo.setQuantity(comboxGoods.getQty());
-                        couponProductVo.setProductId(comboxGoods.getGoodsId());
-                        couponProductVo.setCategoryCode(null);
-                        productList.add(couponProductVo);
-                    });
-                }
+//                if (CollectionUtils.isNotEmpty(cartGood.getProductComboList())) {
+//                    cartGood.getProductComboList().forEach(comboxGoods -> {
+//                        CouponProductVo couponProductVo = new CouponProductVo();
+//                        couponProductVo.setAmount(Integer.valueOf(comboxGoods.getAmount().toString()));
+//                        couponProductVo.setKeyProductCode(comboxGoods.getCustomerCode());
+//                        couponProductVo.setQuantity(comboxGoods.getQty());
+//                        couponProductVo.setProductId(comboxGoods.getGoodsId());
+//                        couponProductVo.setCategoryCode(null);
+//                        productList.add(couponProductVo);
+//                    });
+//                }
+//                if (CollectionUtils.isNotEmpty(cartGood.getProductGroupList())) {
+//                    cartGood.getProductGroupList().forEach(comboxGoods -> {
+//                        CouponProductVo couponProductVo = new CouponProductVo();
+//                        couponProductVo.setAmount(Integer.valueOf(comboxGoods.getAmount().toString()));
+//                        couponProductVo.setKeyProductCode(comboxGoods.getCustomerCode());
+//                        couponProductVo.setQuantity(comboxGoods.getQty());
+//                        couponProductVo.setProductId(comboxGoods.getGoodsId());
+//                        couponProductVo.setCategoryCode(null);
+//                        productList.add(couponProductVo);
+//                    });
+//                }
             });
             res.setProductList(productList);
             Long totalAmount = createProductRequest(cartGoods, productList);