Merge branch 'feature-yu.sun-20200915-new' into qa

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

@@ -546,7 +546,23 @@ public class ShoppingCartMCoffeeServiceImpl {
         // 新门店check购物车中所有商品
         cartGoodsList = checkCartGoods(partnerId, toStoreId, orderType, menuType, shoppingCartGoodsResponseVo, cartGoodsList);
         if (requestVo.getOperationType() == ShoppingCartOperationType.UPDATE3.getCode()) {
-            return ResponseUtil.success(shoppingCartGoodsResponseVo);
+            if (null == shoppingCartGoodsResponseVo.getChanged() || StringUtils.isEmpty(shoppingCartGoodsResponseVo.getToastMsg())){
+                // 重新存储新门店购物车
+                assortmentSdkService.setShoppingCart(partnerId, toStoreId, userId, cartGoodsList, sessionId, "", shoppingCartBaseService);
+                //清空商品券商品
+                clearCartCouponGoods(partnerId, toStoreId, userId, sessionId, cartGoodsList);
+                // 当couponCode不为空时，需参与价格计算
+                List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons = getCoupon(couponCode, null, cartGoodsList);
+
+                // 促销活动的优惠金额计算
+                calculationService.updateShoppingCartGoodsDiscount(partnerId, toStoreId, userId, appId, orderType, assortmentCustomerInfoVo.isMemberPaid(), menuType, receiveId, null,
+                        cartGoodsList, coupons, new ArrayList<>(), shoppingCartGoodsResponseVo);
+                //设置更新响应信息
+                setAddAndUpdateResponse(shoppingCartGoodsResponseVo, cartGoodsList, shoppingCartGoodsResponseVo.getToastMsg(), ShoppingCartConstant.QUERY_INFO, shoppingCartInfoRequestVo);
+                shoppingCartGoodsResponseVo.setChanged(false);
+            }else {
+                return ResponseUtil.success(shoppingCartGoodsResponseVo);
+            }
         }
         // 新门店check购物车中所有商品
         if (requestVo.getOperationType() == ShoppingCartOperationType.UPDATE4.getCode()) {

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

@@ -408,9 +408,9 @@ public class CalculationServiceImpl {
         long totalPackgeAmount = 0L;
         for (CartGoods cartGoods : cartGoodsList) {
             // 设置商品原价与商品现价的初始值
-            long originalAmount = (null != cartGoods.getOriginalPrice() ? cartGoods.getOriginalPrice() : 0) * cartGoods.getQty();
-            long amount =  (null != cartGoods.getOriginalPrice() ? cartGoods.getOriginalPrice() : 0) * cartGoods.getQty();
-            long packAmount =  (null != cartGoods.getPackPrice() ? cartGoods.getPackPrice() : 0) * cartGoods.getQty();
+            long originalAmount = null != cartGoods.getOriginalPrice() ? cartGoods.getOriginalPrice() : 0;
+            long amount =  null != cartGoods.getOriginalPrice() ? cartGoods.getOriginalPrice() : 0;
+            long packAmount =  null != cartGoods.getPackPrice() ? cartGoods.getPackPrice() : 0;
             totalOriginalAmount += originalAmount;
             totalAmount += amount;
             totalPackgeAmount += packAmount;