满赠问题

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

@@ -276,14 +276,14 @@ public class FullPromotionService implements IPromotionService {
                 satisfyList.setTipType(8);
             }
             else {
-                satisfyList.setTipType(9);
+                satisfyList.setTipType(7);
             }
             if (activityPrompt.getTotalAmount()>=activityPrompt.getThresholdAmount()) {
                 if (GiftTypeEnum.TYPE_1.equals(activityResponseDto.getActivitySubType())) {
-                    satisfyList.setTipType(6);
+                    satisfyList.setTipType(10);
                 }
                 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 {
                             if (GiftTypeEnum.TYPE_1.equals(activityResponseDto.getActivitySubType())) {
                                 satisfyList.setTipType(8);
                             } 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 {
                 satisfyList.setTipType(8);
             }
             else {
-                satisfyList.setTipType(9);
+                satisfyList.setTipType(7);
             }
             if (activityPrompt.getTotalAmount()>=activityPrompt.getThresholdAmount()) {
                 if (GiftTypeEnum.TYPE_1.getType().equals(activityResponseDto.getActivitySubType())) {
-                    satisfyList.setTipType(6);
+                    satisfyList.setTipType(10);
                 }
                 else {
-                    satisfyList.setTipType(6);
+                    satisfyList.setTipType(7);
                 }
             }
         }