fix coupon1

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

@@ -2,6 +2,7 @@ package cn.freemud.service.impl.mcoffee;
 
 import ch.qos.logback.classic.Level;
 import cn.freemud.adapter.ActivityAdapter;
+import cn.freemud.adapter.ShoppingCartConvertAdapter;
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.constant.ShoppingCartConstant;
 import cn.freemud.entities.dto.*;
@@ -375,7 +376,7 @@ public class ShoppingCartMCoffeeServiceImpl {
         // 获取购物车商品?
          List<CartGoods> cartGoodsList = assortmentSdkService.getShoppingCartForCoupon(requestVo.getPartnerId(), requestVo.getStoreId(), requestVo.getUserId(), "", shoppingCartBaseService);
         // 当couponCode不为空时，需参与价格计算
-        List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons = getCoupon(null, null, cartGoodsList);
+        List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons = getCoupon(null, null, cartGoodsList,null);
         // 促销活动的优惠金额计算
         calculationService.updateShoppingCartGoodsDiscount(requestVo.getPartnerId(), requestVo.getStoreId(), requestVo.getUserId(), requestVo.getAppId(), requestVo.getOrderType(), assortmentCustomerInfoVo.isMemberPaid(), requestVo.getMenuType(), requestVo.getReceiveId(), null,
         cartGoodsList, coupons, new ArrayList<>(), shoppingCartGoodsResponseVo);
@@ -591,7 +592,7 @@ public class ShoppingCartMCoffeeServiceImpl {
                 //清空商品券商品
                 clearCartCouponGoods(partnerId, toStoreId, userId, sessionId, cartGoodsList);
                 // 当couponCode不为空时，需参与价格计算
-                List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons = getCoupon(couponCode, null, cartGoodsList);
+                List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons = getCoupon(couponCode, null, cartGoodsList,null);
 
                 // 促销活动的优惠金额计算
                 calculationService.updateShoppingCartGoodsDiscount(partnerId, toStoreId, userId, appId, orderType, assortmentCustomerInfoVo.isMemberPaid(), menuType, receiveId, null,