Skip to content

O
order-group
Commit e3c38703 by 张洪旺
Options

Merge branch 'coco20201223-bug-zhw' of gitlab.freemud.com:order-group-application/order-group

parents 1d9d6913 88762810
Showing with 2 additions and 2 deletions
order-application-service/src/main/java/cn/freemud/service/impl/DefaultPromotionService.java
...@@ -86,7 +86,7 @@ public class DefaultPromotionService implements IPromotionService { ...@@ -86,7 +86,7 @@ public class DefaultPromotionService implements IPromotionService {
for (CalculationGoodsActivityDto discount : discounts) { for (CalculationGoodsActivityDto discount : discounts) {
Integer discountAmount = discount.getDiscount() == null ? 0 : discount.getDiscount(); Integer discountAmount = discount.getDiscount() == null ? 0 : discount.getDiscount();
Integer discountType = discount.getType(); Integer discountType = discount.getType();
if (discountType != null && discountAmount > 0) { if (discountType != null && discountAmount >= 0) {
ActivityDiscountsDto activityDiscountsDto = new ActivityDiscountsDto(); ActivityDiscountsDto activityDiscountsDto = new ActivityDiscountsDto();
activityDiscountsDto.setActivityCode(discount.getActivityCode()); activityDiscountsDto.setActivityCode(discount.getActivityCode());
activityDiscountsDto.setActivityName(discount.getActivityName()); activityDiscountsDto.setActivityName(discount.getActivityName());
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationSharingEquallyService.java
...@@ -207,7 +207,7 @@ public class CalculationSharingEquallyService { ...@@ -207,7 +207,7 @@ public class CalculationSharingEquallyService {
for (CalculationSharingDiscountResponseDto.CalculationDiscountResult.Discount discount : discounts) { for (CalculationSharingDiscountResponseDto.CalculationDiscountResult.Discount discount : discounts) {
int discountAmount = (discount.getDiscount() == null) ? 0 : discount.getDiscount(); int discountAmount = (discount.getDiscount() == null) ? 0 : discount.getDiscount();
Integer discountType = discount.getType(); Integer discountType = discount.getType();
if (discountType != null && discountAmount > 0) { if (discountType != null && discountAmount >= 0) {
ActivityDiscountsDto activityDiscountsDto = new ActivityDiscountsDto(); ActivityDiscountsDto activityDiscountsDto = new ActivityDiscountsDto();
activityDiscountsDto.setActivityCode(discount.getActivityCode()); activityDiscountsDto.setActivityCode(discount.getActivityCode());
activityDiscountsDto.setActivityName(discount.getActivityName()); activityDiscountsDto.setActivityName(discount.getActivityName());
......
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