Skip to content

O
order-group
Commit 13134f02 by chongfu.liang
Options

满赠问题

parent 08117b32
Showing with 7 additions and 7 deletions
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/FullPromotionService.java
...@@ -276,14 +276,14 @@ public class FullPromotionService implements IPromotionService { ...@@ -276,14 +276,14 @@ public class FullPromotionService implements IPromotionService {
satisfyList.setTipType(8); satisfyList.setTipType(8);
} }
else { else {
satisfyList.setTipType(9); satisfyList.setTipType(7);
} }
if (activityPrompt.getTotalAmount()>=activityPrompt.getThresholdAmount()) { if (activityPrompt.getTotalAmount()>=activityPrompt.getThresholdAmount()) {
if (GiftTypeEnum.TYPE_1.equals(activityResponseDto.getActivitySubType())) { if (GiftTypeEnum.TYPE_1.equals(activityResponseDto.getActivitySubType())) {
satisfyList.setTipType(6); satisfyList.setTipType(10);
} }
else { else {
satisfyList.setTipType(6); satisfyList.setTipType(7);
} }
} }
} }
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/FullSubtractionActivityServiceImpl.java
...@@ -354,7 +354,7 @@ public class FullSubtractionActivityServiceImpl { ...@@ -354,7 +354,7 @@ public class FullSubtractionActivityServiceImpl {
if (GiftTypeEnum.TYPE_1.equals(activityResponseDto.getActivitySubType())) { if (GiftTypeEnum.TYPE_1.equals(activityResponseDto.getActivitySubType())) {
satisfyList.setTipType(8); satisfyList.setTipType(8);
} else { } else {
satisfyList.setTipType(9); satisfyList.setTipType(7);
} }
} }
} }
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/promotion/FullSharingService.java
...@@ -367,14 +367,14 @@ public class FullSharingService { ...@@ -367,14 +367,14 @@ public class FullSharingService {
satisfyList.setTipType(8); satisfyList.setTipType(8);
} }
else { else {
satisfyList.setTipType(9); satisfyList.setTipType(7);
} }
if (activityPrompt.getTotalAmount()>=activityPrompt.getThresholdAmount()) { if (activityPrompt.getTotalAmount()>=activityPrompt.getThresholdAmount()) {
if (GiftTypeEnum.TYPE_1.getType().equals(activityResponseDto.getActivitySubType())) { if (GiftTypeEnum.TYPE_1.getType().equals(activityResponseDto.getActivitySubType())) {
satisfyList.setTipType(6); satisfyList.setTipType(10);
} }
else { else {
satisfyList.setTipType(6); satisfyList.setTipType(7);
} }
} }
} }
......
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