Skip to content

O
order-group
Commit 35052ad3 by xiaoer.li@freemud.com
Options

modify:均摊

parent e6f278b1
Showing with 3 additions and 3 deletions
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/BuyAndGiftsPromotionService.java
...@@ -147,8 +147,8 @@ public class BuyAndGiftsPromotionService implements IPromotionService { ...@@ -147,8 +147,8 @@ public class BuyAndGiftsPromotionService implements IPromotionService {
ProductActivityDiscountsDto.setActivityName(sendActivity.getActivityName()); ProductActivityDiscountsDto.setActivityName(sendActivity.getActivityName());
ProductActivityDiscountsDto.setActivityType(sendActivity.getActivityType()); ProductActivityDiscountsDto.setActivityType(sendActivity.getActivityType());
if (cartGoodsDetailDto.getActivityType().equals(ActivityTypeEnum.TYPE_230.getCode())) { if (cartGoodsDetailDto.getActivityType().equals(ActivityTypeEnum.TYPE_230.getCode())) {
cartGoodsDetailDto.setTotalDiscountAmount(cartGoodsDetailDto.getOriginalPrice().intValue()); cartGoodsDetailDto.setTotalDiscountAmount(cartGoodsDetailDto.getOriginalPrice().intValue()*cartGoodsDetailDto.getQty());
ProductActivityDiscountsDto.setDiscountAmount(cartGoodsDetailDto.getOriginalPrice().intValue()); ProductActivityDiscountsDto.setDiscountAmount(cartGoodsDetailDto.getOriginalPrice().intValue()*cartGoodsDetailDto.getQty());
} }
else { else {
ProductActivityDiscountsDto.setDiscountAmount(cartGoodsDetailDto.getTotalDiscountAmount()); ProductActivityDiscountsDto.setDiscountAmount(cartGoodsDetailDto.getTotalDiscountAmount());
...@@ -170,7 +170,7 @@ public class BuyAndGiftsPromotionService implements IPromotionService { ...@@ -170,7 +170,7 @@ public class BuyAndGiftsPromotionService implements IPromotionService {
Long totalDiscountOriginalAmount = sendGoodsList Long totalDiscountOriginalAmount = sendGoodsList
.stream() .stream()
.filter(sendGoods -> ObjectUtils.equals(sendActivity.getActivityCode(), sendGoods.getNodeId())) .filter(sendGoods -> ObjectUtils.equals(sendActivity.getActivityCode(), sendGoods.getNodeId()))
.mapToLong(sendGoods -> sendGoods.getOriginalPrice()) .mapToLong(sendGoods -> sendGoods.getOriginalPrice()*sendGoods.getQty())
.sum(); .sum();
ActivityDiscountsDto activityDiscountsDto = new ActivityDiscountsDto(); ActivityDiscountsDto activityDiscountsDto = new ActivityDiscountsDto();
activityDiscountsDto.setActivityCode(sendActivity.getActivityCode()); activityDiscountsDto.setActivityCode(sendActivity.getActivityCode());
......
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