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

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

@@ -142,6 +142,7 @@ public class ShoppingCartMCoffeeServiceImpl {
         if(StringUtils.isNotEmpty(addShoppingCartGoodsRequestVo.getGroupName())) {
             addCartGoods.setSkuName(addShoppingCartGoodsRequestVo.getGroupName());
             addCartGoods.setSpuName(addShoppingCartGoodsRequestVo.getGroupName());
+            addCartGoods.setName(addShoppingCartGoodsRequestVo.getGroupName());
         }
         //查询多个商品库存信息
 //        Integer checkQty = this.checkSkuQty(oldCartGoodsList, addCartGoods);
@@ -743,6 +744,11 @@ public class ShoppingCartMCoffeeServiceImpl {
         List<CartGoods> nowCartGoodsList = new ArrayList<>();
         //判断当前商品在购物车是否已存在,存在则数量＋1,不存在商品行 + 1
         allCartGoodsList.forEach(oldCartGoods -> {
+            if(oldCartGoods.getSpuId().equals(addCartGoods.getSpuId())) {
+                oldCartGoods.setSpuName(addCartGoods.getSpuName());
+                oldCartGoods.setSkuName(addCartGoods.getSpuName());
+                oldCartGoods.setName(addCartGoods.getName());
+            }
             int index;
             if ((index = nowCartGoodsList.indexOf(oldCartGoods)) >= 0) {
                 nowCartGoodsList.get(index).setQty(nowCartGoodsList.get(index).getQty() + addCartGoods.getQty());

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

@@ -343,6 +343,7 @@ public class CouponDiscountCalculation {
                         couponProductVo.setKeyProductCode(comboxGoods.getCustomerCode());
                         couponProductVo.setQuantity(comboxGoods.getQty());
                         couponProductVo.setProductId(comboxGoods.getGoodsId());
+                        couponProductVo.setCouponCode(cartGood.getCouponCode());
                         couponProductVo.setCategoryCode(null);
                         productList.add(couponProductVo);
                     });
@@ -354,6 +355,7 @@ public class CouponDiscountCalculation {
                         couponProductVo.setKeyProductCode(comboxGoods.getCustomerCode());
                         couponProductVo.setQuantity(comboxGoods.getQty());
                         couponProductVo.setProductId(comboxGoods.getGoodsId());
+                        couponProductVo.setCouponCode(cartGood.getCouponCode());
                         couponProductVo.setCategoryCode(null);
                         productList.add(couponProductVo);
                     });
@@ -365,9 +367,7 @@ public class CouponDiscountCalculation {
             resList.add(res);
         }
         return resList;
-        }
-
-
+    }
 
 
 //    public String getAppSecret(String partnerId) {

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/entity/CouponProductVo.java

@@ -22,6 +22,6 @@ public class CouponProductVo {
     private String productId;
     private Integer amount;
     private Integer quantity;
-
+    private String couponCode;
     private String categoryCode;
 }