增加入参

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

@@ -577,6 +577,10 @@ public class ShoppingCartMCoffeeServiceImpl {
 
         // 先验证商品是否存在
         List<CartGoods> cartGoodsList = assortmentSdkService.getShoppingCart(partnerId, storeId, userId, null, null, shoppingCartBaseService);
+        ApiLog.debug("cartGoodsList: {}",JSONObject.toJSONString(cartGoodsList));
+
+        List<CartGoods> cartSendGoodsList = assortmentSdkService.getShoppingCartSendGoods(partnerId, storeId, userId, sessionId, "", shoppingCartBaseService);
+        ApiLog.debug("cartSendGoodsList: {}",JSONObject.toJSONString(cartSendGoodsList));
         CartGoods cartGoods = null;
         String skuId = "";
         Integer finalQty = qty;
@@ -650,7 +654,7 @@ public class ShoppingCartMCoffeeServiceImpl {
         List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons = getCoupon(couponCode, null, cartGoodsList,freightCouponCode,null);
         // 促销活动的优惠金额计算
         calculationService.updateShoppingCartGoodsDiscount(partnerId, storeId, userId, appId, orderType, assortmentCustomerInfoVo.isMemberPaid(), menuType, receiveId, couponCode,
-                cartGoodsList, coupons, new ArrayList<>(), shoppingCartGoodsResponseVo,null, null);
+                cartGoodsList, coupons, new ArrayList<>(), shoppingCartGoodsResponseVo,null, cartSendGoodsList);
 
         //把月卡放到最后
         if (CollectionUtils.isNotEmpty(cartGoodsList)) {