Skip to content

O
order-group
Commit 0dccdfb1 by ping.wu
Options

买m赠n券商品级别优惠为正数

parent d6650e2f
Showing with 4 additions and 1 deletions
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/CouponPromotionService.java
...@@ -228,6 +228,7 @@ public class CouponPromotionService implements IPromotionService { ...@@ -228,6 +228,7 @@ public class CouponPromotionService implements IPromotionService {
if (activityDiscountsDto != null) { if (activityDiscountsDto != null) {
ActivityDiscountsDto activityDiscountsDto1 = new ActivityDiscountsDto(); ActivityDiscountsDto activityDiscountsDto1 = new ActivityDiscountsDto();
BeanUtils.copyProperties(activityDiscountsDto, activityDiscountsDto1); BeanUtils.copyProperties(activityDiscountsDto, activityDiscountsDto1);
//商品级别优惠为正数
activityDiscountsDto1.setDiscountAmount(-activityDiscountsDto.getDiscountAmount()); activityDiscountsDto1.setDiscountAmount(-activityDiscountsDto.getDiscountAmount());
cartGoods.setTotalDiscountAmount(-activityDiscountsDto.getDiscountAmount()); cartGoods.setTotalDiscountAmount(-activityDiscountsDto.getDiscountAmount());
...@@ -269,6 +270,7 @@ public class CouponPromotionService implements IPromotionService { ...@@ -269,6 +270,7 @@ public class CouponPromotionService implements IPromotionService {
activityDiscountsDto.setActivityCode(apportionDetails.getActivityCode()); activityDiscountsDto.setActivityCode(apportionDetails.getActivityCode());
activityDiscountsDto.setActivityName(apportionDetails.getActivityName()); activityDiscountsDto.setActivityName(apportionDetails.getActivityName());
activityDiscountsDto.setActivityType(this.convent2ActivityType(apportionDetails.getActivityType())); activityDiscountsDto.setActivityType(this.convent2ActivityType(apportionDetails.getActivityType()));
//订单活动级别优惠为负值
activityDiscountsDto.setDiscountAmount(0 - couponDiscount.getDiscountAmount()); activityDiscountsDto.setDiscountAmount(0 - couponDiscount.getDiscountAmount());
return activityDiscountsDto; return activityDiscountsDto;
} }
...@@ -285,7 +287,8 @@ public class CouponPromotionService implements IPromotionService { ...@@ -285,7 +287,8 @@ public class CouponPromotionService implements IPromotionService {
activityDiscountsDto.setActivityCode(discounts.get(0).getActivityCode()); activityDiscountsDto.setActivityCode(discounts.get(0).getActivityCode());
activityDiscountsDto.setActivityName(discounts.get(0).getActivityName()); activityDiscountsDto.setActivityName(discounts.get(0).getActivityName());
activityDiscountsDto.setActivityType(this.convent2ActivityType(discounts.get(0).getType())); activityDiscountsDto.setActivityType(this.convent2ActivityType(discounts.get(0).getType()));
activityDiscountsDto.setDiscountAmount(0 - discounts.get(0).getDiscount().intValue()); //商品级别优惠为正数
activityDiscountsDto.setDiscountAmount(discounts.get(0).getDiscount().intValue());
activityDiscountsDto.setActualActivityGoodsNumber(discounts.get(0).getActualGoodsNumber()); activityDiscountsDto.setActualActivityGoodsNumber(discounts.get(0).getActualGoodsNumber());
activityDiscountsDto.setCartGoodsUid(goods1.getCartGoodsUid()); activityDiscountsDto.setCartGoodsUid(goods1.getCartGoodsUid());
......
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