Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa

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

@@ -57,7 +57,7 @@ public class CouponPromotionService implements IPromotionService {
             boolean hasGoodssCoupon = CollectionUtils.isNotEmpty(tmpCartGoods);
             // 构建可用不可用优惠券
             ActivityClassifyCouponBean activityClassifyCouponBean = couponService.availableCoupon(cartGoodsList, couponPromotionVO.getPartnerId()
-                    , couponPromotionVO.getUserId(), couponPromotionVO.getStoreId(), couponPromotionVO.getCouponCode(), hasGoodssCoupon, couponPromotionVO.getOrderType());
+                    , couponPromotionVO.getUserId(), couponPromotionVO.getStoreId(), couponPromotionVO.getCouponCode(), hasGoodssCoupon, couponPromotionVO.getOrderType(), 0);
             if (Objects.equals(activityClassifyCouponBean, null)) {
                 // 构建一个空得订单券信息
                 activityClassifyCouponBean = createEmptyActivityCouponBean();