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

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

@@ -437,7 +437,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                     , orderType
                     , assortmentCustomerInfoVo.isMemberPaid()
                     , cartGoodsList
-                    , null //券
+                    , new ArrayList() //券
                     , null //加价购商品
                     , deliveryAmount);
 

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

@@ -61,7 +61,8 @@ public class CalculationSharingDiscountService {
             , String appId
             , Integer orderType
             , boolean isMember
-            , List<CartGoods> cartGoodsList, List<CalculationSharingDiscountRequestDto.CalculationDiscountCoupon> coupons
+            , List<CartGoods> cartGoodsList
+            , List<CalculationSharingDiscountRequestDto.CalculationDiscountCoupon> coupons
             , List<ShoppingCartInfoRequestVo.SendGoods> sendGoodsList
             , Long deliveryAmount) {