已满

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/ActivityCalculationDiscountResponseDto.java

@@ -169,6 +169,7 @@ public class ActivityCalculationDiscountResponseDto {
              * 已经优惠金额
              */
             private Long alreadyDiscountAmount;
+            private Integer alreadyDiscountThresholdAmount;
             private Integer activitySubType;
             private List<SendGoods> sendGoods;
         }

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/FreightCalculation.java

@@ -35,7 +35,7 @@ public class FreightCalculation {
                 }
                 ActivityList activityList = new ActivityList();
                 activityList.setTipType(activityPrompt.getActivityType());
-                activityList.setSatisfy(MoneyUtils.parseFen2Yuan(activityPrompt.getThresholdAmount()));
+                activityList.setSatisfy(MoneyUtils.parseFen2Yuan(activityPrompt.getAlreadyDiscountThresholdAmount()));
                 activityList.setAlreadyDecut(MoneyUtils.parseFen2Yuan(activityPrompt.getAlreadyDiscountAmount()));
                 activityList.setDeduct(MoneyUtils.parseFen2Yuan(activityPrompt.getAlreadyDiscountAmount()));
                 activityList.setAgianDeduct(MoneyUtils.parseFen2Yuan(activityPrompt.getDiscountAmout() - activityPrompt.getAlreadyDiscountAmount()));