Merge branch ''bugfix/20201020_线上问题修复_xukang'' into qa

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

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

@@ -303,10 +303,14 @@ public class ShoppingCartMCoffeeServiceImpl {
         // 重新存储最新购物车
         assortmentSdkService.setShoppingCart(partnerId, storeId, userId, cartGoodsList, sessionId, "", shoppingCartBaseService);
 
+        String couponCode = assortmentSdkService.getShoppingCartCoupon(partnerId, storeId, userId, shoppingCartBaseService, SaveCouponType.COUPON.getCode());
+
+        String freightCouponCode = assortmentSdkService.getShoppingCartCoupon(partnerId, storeId, userId, shoppingCartBaseService, SaveCouponType.FREIGHT_COUPON.getCode());
+
         // 当couponCode不为空时，需参与价格计算
-        List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons = getCoupon(null, null, cartGoodsList,null, null);
+        List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons = getCoupon(couponCode, null, cartGoodsList,null, null);
         // 促销活动的优惠金额计算
-        calculationService.updateShoppingCartGoodsDiscount(partnerId, storeId, userId, appId, orderType, assortmentCustomerInfoVo.isMemberPaid(), menuType, receiveId, null,
+        calculationService.updateShoppingCartGoodsDiscount(partnerId, storeId, userId, appId, orderType, assortmentCustomerInfoVo.isMemberPaid(), menuType, receiveId, couponCode,
                 cartGoodsList, coupons, new ArrayList<>(), shoppingCartGoodsResponseVo,null);
         //设置更新响应信息
         setAddAndUpdateResponse(shoppingCartGoodsResponseVo, cartGoodsList, shoppingCartGoodsResponseVo.getToastMsg(), ShoppingCartConstant.ADD_AND_UPDATE, null);
@@ -922,11 +926,6 @@ 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());