fix 冲突

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

@@ -177,7 +177,7 @@ public class ShoppingCartMCoffeeServiceImpl {
         }
 
         //商品券已添加情况校验
-        List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons = checkGoodsCoupon(oldCartGoodsList, operationType, couponCode,goodsId);
+        List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons = checkGoodsCoupon(oldCartGoodsList, operationType, couponCode,goodsId,addShoppingCartGoodsRequestVo);
         CartGoods addCartGoods = convent2CartGoods(addShoppingCartGoodsRequestVo, goodsId ,vo);
         setClassificationAndPrice(addCartGoods, productBeanListSpuClass);
         if(StringUtils.isNotEmpty(addShoppingCartGoodsRequestVo.getGroupName())) {
@@ -236,7 +236,7 @@ public class ShoppingCartMCoffeeServiceImpl {
     }
 
 
-    private List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> checkGoodsCoupon(List<CartGoods> oldCartGoodsList, Integer operationType, String couponCode,String goodsId) {
+    private List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> checkGoodsCoupon(List<CartGoods> oldCartGoodsList, Integer operationType, String couponCode,String goodsId,MCoffeeAddGoodsRequestVo addShoppingCartGoodsRequestVo) {
         if (operationType != null && operationType == 1 && StringUtils.isBlank(couponCode)) {
             throw new ServiceException(ResponseResult.PARAMETER_MISSING, "商品券券号为空");
         }