Commit 2dea841c by 查志伟

修复免单活动时,C端展示问题

parent 935e7036
...@@ -135,6 +135,12 @@ public class CalculationCommonService { ...@@ -135,6 +135,12 @@ public class CalculationCommonService {
cartGoods.setAmount(find.getRealAmount()); cartGoods.setAmount(find.getRealAmount());
cartGoods.setCurrentCouponDiscount(0); cartGoods.setCurrentCouponDiscount(0);
cartGoods.setFinalPrice(find.getNowPrice()); cartGoods.setFinalPrice(find.getNowPrice());
// fix 免单情况,C端展示问题
int activityNumber = 0;
for (CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount discount : find.getDiscounts()) {
activityNumber += discount.getActualGoodsNumber();
}
cartGoods.setActivityNumber(activityNumber);
if (CollectionUtils.isNotEmpty(find.getDiscounts())){ if (CollectionUtils.isNotEmpty(find.getDiscounts())){
CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount goodsDiscount = find.getDiscounts().stream() CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount goodsDiscount = find.getDiscounts().stream()
.filter(p -> p.getActivityCode().equals(couponCode)).findFirst().orElse(null); .filter(p -> p.getActivityCode().equals(couponCode)).findFirst().orElse(null);
......
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