Commit d72d6066 by xiaoer.li@freemud.com

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

parents 95f48a92 bcd5eff8
...@@ -437,7 +437,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService { ...@@ -437,7 +437,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
, orderType , orderType
, assortmentCustomerInfoVo.isMemberPaid() , assortmentCustomerInfoVo.isMemberPaid()
, cartGoodsList , cartGoodsList
, null //券 , new ArrayList() //券
, null //加价购商品 , null //加价购商品
, deliveryAmount); , deliveryAmount);
......
...@@ -61,7 +61,8 @@ public class CalculationSharingDiscountService { ...@@ -61,7 +61,8 @@ public class CalculationSharingDiscountService {
, String appId , String appId
, Integer orderType , Integer orderType
, boolean isMember , boolean isMember
, List<CartGoods> cartGoodsList, List<CalculationSharingDiscountRequestDto.CalculationDiscountCoupon> coupons , List<CartGoods> cartGoodsList
, List<CalculationSharingDiscountRequestDto.CalculationDiscountCoupon> coupons
, List<ShoppingCartInfoRequestVo.SendGoods> sendGoodsList , List<ShoppingCartInfoRequestVo.SendGoods> sendGoodsList
, Long deliveryAmount) { , Long deliveryAmount) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment