合代码

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

@@ -231,7 +231,7 @@ public class ShoppingCartMCoffeeServiceImpl {
                 oldCartGoodsList.add(addCartGoods);
                 // 促销活动的优惠金额计算
                 calculationService.updateShoppingCartGoodsDiscount(partnerId, storeId, userId, appId, orderType, assortmentCustomerInfoVo.isMemberPaid(), menuType, receiveId, couponCode,
-                        oldCartGoodsList, coupons, new ArrayList<>(), shoppingCartGoodsResponseVo,null);
+                        oldCartGoodsList, coupons, new ArrayList<>(), shoppingCartGoodsResponseVo,null, null);
                 assortmentSdkService.setShoppingCart(partnerId, storeId, userId, oldCartGoodsList, null, tableNumber, this.shoppingCartBaseService);
                 newCartGoods = oldCartGoodsList;
             } else if(StringUtils.equals("9998",skuId)){
@@ -248,7 +248,7 @@ public class ShoppingCartMCoffeeServiceImpl {
                 }
                 // 促销活动的优惠金额计算
                 calculationService.updateShoppingCartGoodsDiscount(partnerId, storeId, userId, appId, orderType, assortmentCustomerInfoVo.isMemberPaid(), menuType, receiveId, couponCode,
-                        oldCartGoodsList, coupons, new ArrayList<>(), shoppingCartGoodsResponseVo,null);
+                        oldCartGoodsList, coupons, new ArrayList<>(), shoppingCartGoodsResponseVo,null, null);
                 assortmentSdkService.setShoppingCart(partnerId, storeId, userId, oldCartGoodsList, null, tableNumber, this.shoppingCartBaseService);
                 newCartGoods = oldCartGoodsList;
             } else {
@@ -261,14 +261,6 @@ public class ShoppingCartMCoffeeServiceImpl {
                         newCartGoods, coupons, new ArrayList<>(), shoppingCartGoodsResponseVo, null, null);
                 // 重新保存购物车数据
                 assortmentSdkService.setShoppingCart(partnerId, storeId, userId, newCartGoods, null, tableNumber, this.shoppingCartBaseService);
-            }else{
-                // 将月享卡2.0的虚拟商品保存到购物车中
-                oldCartGoodsList.add(addCartGoods);
-                // 促销活动的优惠金额计算
-                calculationService.updateShoppingCartGoodsDiscount(partnerId, storeId, userId, appId, orderType, assortmentCustomerInfoVo.isMemberPaid(), menuType, receiveId, couponCode,
-                        oldCartGoodsList, coupons, new ArrayList<>(), shoppingCartGoodsResponseVo,null, null);
-                assortmentSdkService.setShoppingCart(partnerId, storeId, userId, oldCartGoodsList, null, tableNumber, this.shoppingCartBaseService);
-                newCartGoods = oldCartGoodsList;
             }
             // 返回购物车数据
             setAddAndUpdateResponse(shoppingCartGoodsResponseVo, newCartGoods, null, ShoppingCartConstant.ADD_AND_UPDATE, null);
@@ -735,7 +727,7 @@ public class ShoppingCartMCoffeeServiceImpl {
         List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons = getCoupon(productCouponCode, null, cartGoodsList,freightCouponCode,null);
         // 促销活动的优惠金额计算
         calculationService.updateShoppingCartGoodsDiscount(partnerId, storeId, userId, appId, orderType, assortmentCustomerInfoVo.isMemberPaid(), menuType, receiveId, couponCode,
-                cartGoodsList, coupons, new ArrayList<>(), shoppingCartGoodsResponseVo,null);
+                cartGoodsList, coupons, new ArrayList<>(), shoppingCartGoodsResponseVo,null, null);
 
         assortmentSdkService.setShoppingCart(partnerId, storeId, userId, cartGoodsList, null, tableNumber, this.shoppingCartBaseService);