Merge branch 'feature-yu.sun-autoSelect-20201025' into qa

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

@@ -367,7 +367,6 @@ public class CouponDiscountCalculation {
         res.setStoreId(requestVo.getStoreId());
         res.setChannelIdList(commonService.getOrgCodes(requestVo.getPartnerId(), requestVo.getStoreId()));
         res.setCouponCodes(couponCodes);
-        List<CartGoods> productList = new ArrayList<>();
         List<CouponProductVo> calculAmountProductList = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(cartGoods)) {
             cartGoods.forEach(cartGood -> {
@@ -405,7 +404,7 @@ public class CouponDiscountCalculation {
 //                    });
 //                }
             });
-            res.setProductList(productList);
+            res.setProductList(cartGoods);
             Long totalAmount = createProductRequest(cartGoods, calculAmountProductList);
             res.setTotalAmount(Integer.valueOf(totalAmount.toString()));
             resList.add(res);