Commit 1bce87ff by chongfu.liang

fix

parent 8d5d61fe
...@@ -451,9 +451,8 @@ public class AbstractListCartGoodsService implements ListCartGoodsService { ...@@ -451,9 +451,8 @@ public class AbstractListCartGoodsService implements ListCartGoodsService {
// 满减 // 满减
FullReductionBO fullReductionBO = this.fullReduction(baseRequestDTO, distributeBO.getCalculationDiscountBO(), distributeBO.getCartGoods(), activityQueryDto); FullReductionBO fullReductionBO = this.fullReduction(baseRequestDTO, distributeBO.getCalculationDiscountBO(), distributeBO.getCartGoods(), activityQueryDto);
List<CartGoods> giftGoods = null; List<CartGoods> giftGoods = new ArrayList<>();
AdditionBO additionBO = null; AdditionBO additionBO = new AdditionBO(0L ,0l);
ScoreReduceBO scoreReduceBO = null;
if (distributeBO.getCalculationDiscountBO() != null && CollectionUtils.isEmpty(distributeBO.getCartGoods())){ if (distributeBO.getCalculationDiscountBO() != null && CollectionUtils.isEmpty(distributeBO.getCartGoods())){
/** /**
* 用促销价格初始化购物车行记录成交价 * 用促销价格初始化购物车行记录成交价
...@@ -473,7 +472,7 @@ public class AbstractListCartGoodsService implements ListCartGoodsService { ...@@ -473,7 +472,7 @@ public class AbstractListCartGoodsService implements ListCartGoodsService {
/** /**
* 积分抵扣 * 积分抵扣
*/ */
scoreReduceBO = this.scoreReduce(distributeBO.getCalculationDiscountBO(), baseRequestDTO, shoppingGoodsAmountBO, additionBO); scoreReduceBO scoreReduceBO = this.scoreReduce(distributeBO.getCalculationDiscountBO(), baseRequestDTO, shoppingGoodsAmountBO, additionBO);
/** /**
* 配送费 * 配送费
......
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