满减文案修复

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

@@ -221,7 +221,7 @@ public class FullPromotionService implements IPromotionService {
 
         ActivityList satisfyList = new ActivityList();
         ActivityCalculationDiscountResponseDto.CalculationDiscountResult.ActivityPrompt activityPrompt = activityPrompts.get(0);
-        if (Objects.equals(ActivityTypeEnum.TYPE_11.getCode(), activityResponseDto.getActivityType()) || GiftTypeEnum.TYPE_2.equals(activityResponseDto.getActivitySubType())) {
+        if (Objects.equals(ActivityTypeEnum.TYPE_11.getCode(), activityResponseDto.getActivityType()) || Objects.equals(ActivityTypeEnum.TYPE_12.getCode(), activityResponseDto.getActivityType())) {
             if (activityPrompt.getAlreadyDiscountAmount() == null
                     || activityPrompt.getAlreadyDiscountAmount() == 0) {
                 messageBuilder.append("满 <span style=\"color:#fa5555\">")
@@ -240,7 +240,7 @@ public class FullPromotionService implements IPromotionService {
             } else {
                 Long toDiscountAmout;
                 //每满减
-                if (Objects.equals(ActivityTypeEnum.TYPE_11.getCode(), activityResponseDto.getActivityType()) || GiftTypeEnum.TYPE_2.equals(activityResponseDto.getActivitySubType())) {
+                if (Objects.equals(ActivityTypeEnum.TYPE_11.getCode(), activityResponseDto.getActivityType()) || Objects.equals(ActivityTypeEnum.TYPE_12.getCode(), activityResponseDto.getActivityType())) {
                     toDiscountAmout = activityPrompt.getDiscountAmout() + activityPrompt.getAlreadyDiscountAmount();
                 } else {
                     toDiscountAmout = activityPrompt.getDiscountAmout();

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

@@ -319,10 +319,10 @@ public class FullSubtractionActivityServiceImpl {
                     else {
                         Long toDiscountAmout;
                         //每满减
-                        if (Objects.equals(ActivityTypeEnum.TYPE_11.getCode(), activityResponseDto.getActivityType()) || GiftTypeEnum.TYPE_2.equals(activityResponseDto.getActivitySubType())) {
+                        if (Objects.equals(ActivityTypeEnum.TYPE_11.getCode(), activityResponseDto.getActivityType()) || Objects.equals(ActivityTypeEnum.TYPE_12.getCode(), activityResponseDto.getActivityType())) {
 
                             if (Objects.equals(ActivityTypeEnum.TYPE_11.getCode(), activityResponseDto.getActivityType())
-                                    || GiftTypeEnum.TYPE_2.equals(activityResponseDto.getActivitySubType())) {
+                                    || Objects.equals(ActivityTypeEnum.TYPE_12.getCode(), activityResponseDto.getActivityType())) {
                                 toDiscountAmout = activityPrompt.getDiscountAmout() + activityPrompt.getAlreadyDiscountAmount();
                             } else {
                                 toDiscountAmout = activityPrompt.getDiscountAmout();

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/promotion/FullSharingService.java

@@ -314,7 +314,7 @@ public class FullSharingService {
 
         ActivityList satisfyList = new ActivityList();
         CalculationSharingDiscountResponseDto.CalculationDiscountResult.ActivityPrompt activityPrompt = activityPrompts.get(0);
-        if (Objects.equals(ActivityTypeEnum.TYPE_11.getCode(), activityResponseDto.getActivityType()) || GiftTypeEnum.TYPE_2.equals(activityResponseDto.getActivitySubType())) {
+        if (Objects.equals(ActivityTypeEnum.TYPE_11.getCode(), activityResponseDto.getActivityType()) || Objects.equals(ActivityTypeEnum.TYPE_12.getCode(), activityResponseDto.getActivityType())) {
             if (activityPrompt.getAlreadyDiscountAmount() == null || activityPrompt.getAlreadyDiscountAmount() == 0) {
                 messageBuilder.append("满 <span style=\"color:#fa5555\">")
                         .append(WebUtil.formatAmount(activityPrompt.getThresholdAmount() * 1.00 / 100))