Modify:调整修改范围

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

@@ -219,6 +219,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 (activityPrompt.getAlreadyDiscountAmount() == null
                     || activityPrompt.getAlreadyDiscountAmount() == 0) {
                 messageBuilder.append("满 <span style=\"color:#fa5555\">")
@@ -234,13 +235,10 @@ public class FullPromotionService implements IPromotionService {
                 satisfyList.setSatisfy(WebUtil.formatAmount(activityPrompt.getThresholdAmount() * 1.00 / 100).toString());
                 satisfyList.setDeduct(WebUtil.formatAmount(activityPrompt.getDiscountAmout() * 1.00 / 100).toString());
                 satisfyList.setMissing(WebUtil.formatAmount((activityPrompt.getThresholdAmount() - activityPrompt.getTotalAmount()) * 1.00 / 100).toString());
-        }
-        else
-        {
+            } else {
                 Long toDiscountAmout;
                 //每满减
-            if (Objects.equals(ActivityTypeEnum.TYPE_11.getCode(), activityResponseDto.getActivityType())
-                    || (Objects.equals(ActivityTypeEnum.TYPE_230.getCode(), activityResponseDto.getActivityType()) && GiftTypeEnum.TYPE_2.equals(activityResponseDto.getActivitySubType()))) {
+                if (Objects.equals(ActivityTypeEnum.TYPE_11.getCode(), activityResponseDto.getActivityType()) || GiftTypeEnum.TYPE_2.equals(activityResponseDto.getActivitySubType())) {
                     toDiscountAmout = activityPrompt.getDiscountAmout() + activityPrompt.getAlreadyDiscountAmount();
                 } else {
                     toDiscountAmout = activityPrompt.getDiscountAmout();
@@ -258,7 +256,7 @@ public class FullPromotionService implements IPromotionService {
                 satisfyList.setAgainBuy(WebUtil.formatAmount((activityPrompt.getThresholdAmount() - activityPrompt.getTotalAmount()) * 1.00 / 100).toString());
                 satisfyList.setAgianDeduct(WebUtil.formatAmount(toDiscountAmout * 1.00 / 100).toString());
             }
-
+        }
         if (Objects.equals(ActivityTypeEnum.TYPE_230.getCode(), activityResponseDto.getActivityType()) && CollectionUtils.isNotEmpty(activityPrompt.getSendGoods())) {
 
             satisfyList.setTipType(10);

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

@@ -313,8 +313,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_230.getCode(), activityResponseDto.getActivityType()) && GiftTypeEnum.TYPE_2.equals(activityResponseDto.getActivitySubType()))) {
+                                    || GiftTypeEnum.TYPE_2.equals(activityResponseDto.getActivitySubType())) {
                                 toDiscountAmout = activityPrompt.getDiscountAmout() + activityPrompt.getAlreadyDiscountAmount();
                             } else {
                                 toDiscountAmout = activityPrompt.getDiscountAmout();
@@ -343,12 +345,12 @@ public class FullSubtractionActivityServiceImpl {
                             satisfyList.setSends(sends);
                             if (GiftTypeEnum.TYPE_1.equals(activityResponseDto.getActivitySubType())) {
                                 satisfyList.setTipType(8);
-                        }
-                        else {
+                            } else {
                                 satisfyList.setTipType(9);
                             }
                         }
                     }
+                }
                 else {
                     discountList = discountList.parallelStream().filter(k -> (Objects.equals(ActivityTypeEnum.TYPE_11.getCode(), k.getType())
                             || Objects.equals(ActivityTypeEnum.TYPE_12.getCode(), k.getType()))).collect(Collectors.toList());