创单查询购物车的时候增加批量使用优惠券的参数

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartInfoRequestVo.java

@@ -49,7 +49,10 @@ public class ShoppingCartInfoRequestVo extends BaseRequestVo {
      */
     private String couponCode;
 
-    private List<String> couponCodes;
+    /**
+     * 优惠券code列表
+     */
+    private List<couponCode> couponCodes;
     /**
      * 优惠券对应的活动号
      */
@@ -178,4 +181,16 @@ public class ShoppingCartInfoRequestVo extends BaseRequestVo {
         private Boolean sendCoupon;
     }
 
+    @Data
+    public final static class couponCode {
+        /**
+         * 优惠券
+         */
+        private String couponCode;
+        /**
+         * 活动号
+         */
+        private String activityCode;
+    }
+
 }

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

@@ -579,13 +579,17 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                 coupons.add(coupon);
             }
 
+            // 当couponCodes不为空时，需参与价格计算,同时排除单券入参
             if (shoppingCartInfoRequestVo.getCouponCodes() != null) {
-                shoppingCartInfoRequestVo.getCouponCodes().forEach(s->{
+                shoppingCartInfoRequestVo.getCouponCodes().forEach(cp -> {
+                    if(ObjectUtils.equals(couponCode,cp.getCouponCode())){
+                        return;
+                    }
                     CalculationSharingDiscountRequestDto.CalculationDiscountCoupon coupon = new CalculationSharingDiscountRequestDto.CalculationDiscountCoupon();
-                    coupon.setCode(s);
+                    coupon.setCode(cp.getCouponCode());
+                    coupon.setActivityCode(cp.getCouponCode());
                     coupons.add(coupon);
                 });
-
             }
 
             List<ShoppingCartInfoRequestVo.SendGoods> sendGoodsList = shoppingCartInfoRequestVo.getSendGoods();
@@ -806,6 +810,18 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                 coupon.setActivityCode(activityCode);
                 coupons.add(coupon);
             }
+            // 当couponCodes不为空时，需参与价格计算,同时排除单券入参
+            if (shoppingCartInfoRequestVo.getCouponCodes() != null) {
+                shoppingCartInfoRequestVo.getCouponCodes().forEach(cp -> {
+                    if(ObjectUtils.equals(couponCode,cp.getCouponCode())){
+                        return;
+                    }
+                    CalculationSharingDiscountRequestDto.CalculationDiscountCoupon coupon = new CalculationSharingDiscountRequestDto.CalculationDiscountCoupon();
+                    coupon.setCode(cp.getCouponCode());
+                    coupon.setActivityCode(cp.getCouponCode());
+                    coupons.add(coupon);
+                });
+            }
             CalculationSharingDiscountResponseDto.CalculationDiscountResult discountResult = sharingDiscountService.getCalculationSharingDiscountResult(menuType
                     , partnerId
                     , storeId