Merge branches 'feature/20211104_买m赠n券商品id问题_wuping' and 'master' of…

Merge branches 'feature/20211104_买m赠n券商品id问题_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/CouponPromotionService.java

@@ -228,6 +228,7 @@ public class CouponPromotionService implements IPromotionService {
                         if (activityDiscountsDto != null) {
                             ActivityDiscountsDto activityDiscountsDto1 = new ActivityDiscountsDto();
                             BeanUtils.copyProperties(activityDiscountsDto, activityDiscountsDto1);
+                            //商品级别优惠为正数
                             activityDiscountsDto1.setDiscountAmount(-activityDiscountsDto.getDiscountAmount());
 
                             cartGoods.setTotalDiscountAmount(-activityDiscountsDto.getDiscountAmount());
@@ -269,6 +270,7 @@ public class CouponPromotionService implements IPromotionService {
                 activityDiscountsDto.setActivityCode(apportionDetails.getActivityCode());
                 activityDiscountsDto.setActivityName(apportionDetails.getActivityName());
                 activityDiscountsDto.setActivityType(this.convent2ActivityType(apportionDetails.getActivityType()));
+                //订单活动级别优惠为负值
                 activityDiscountsDto.setDiscountAmount(0 - couponDiscount.getDiscountAmount());
                 return activityDiscountsDto;
             }
@@ -285,7 +287,8 @@ public class CouponPromotionService implements IPromotionService {
                 activityDiscountsDto.setActivityCode(discounts.get(0).getActivityCode());
                 activityDiscountsDto.setActivityName(discounts.get(0).getActivityName());
                 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.setCartGoodsUid(goods1.getCartGoodsUid());