Skip to content

O
order-group
Commit 95a5989c by shuhu.hou@freemud.cn
Options

Merge branch 'feature/20191119_套餐特价'

parents ae40a430 c9c6fa7f
Showing with 1 additions and 1 deletions
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/DefaultPromotionService.java
...@@ -113,7 +113,7 @@ public class DefaultPromotionService implements IPromotionService { ...@@ -113,7 +113,7 @@ public class DefaultPromotionService implements IPromotionService {
shoppingCartGoodsDto.setActivityDiscountsDtos(activityDiscountsDtos); shoppingCartGoodsDto.setActivityDiscountsDtos(activityDiscountsDtos);
if (null != calculationDiscountResult && ((CollectionUtils.isNotEmpty(activityDiscountsDtos) || CollectionUtils.isNotEmpty(addMoneyDiscounts)))) { if (null != calculationDiscountResult) {
//处理加价购 //处理加价购
List<SubtractStockVO> stocks = filterSendGoodsStocks(calculationDiscountResult.getStocks(), shoppingCartInfoRequestVo, addMoneyDiscounts); List<SubtractStockVO> stocks = filterSendGoodsStocks(calculationDiscountResult.getStocks(), shoppingCartInfoRequestVo, addMoneyDiscounts);
if (CollectionUtils.isNotEmpty(stocks)) { if (CollectionUtils.isNotEmpty(stocks)) {
......
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