update::fixbug

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

@@ -184,6 +184,7 @@ public class FullPromotionService implements IPromotionService {
             // 规则:满5赠奶茶2件，炸鸡1件，满10赠布丁3件，牛奶1份，鸡翅2份，
             // 提示语：满5元可获赠奶茶*2，炸鸡*1
             //阶梯满赠
+            notInShopping.setSatisfy(WebUtil.formatAmount(benefitBeanDto.getThresholdAmount() * 1.00 / 100).toString());
             if (GiftTypeEnum.TYPE_1.equals(activityResponseDto.getActivitySubType())) {
                 notInShopping.setTipType(6);
             }
@@ -260,18 +261,23 @@ public class FullPromotionService implements IPromotionService {
         if (Objects.equals(ActivityTypeEnum.TYPE_230.getCode(), activityResponseDto.getActivityType()) && CollectionUtils.isNotEmpty(activityPrompt.getSendGoods())) {
 
             satisfyList.setTipType(10);
-            ActivityList.SendGoods send = new ActivityList.SendGoods();
-            send.setQty(activityPrompt.getSendGoods().get(0).getSendNumber());
-            send.setGoodsName(activityPrompt.getSendGoods().get(0).getGoodsName());
             List<ActivityList.SendGoods> sends = new ArrayList();
-            sends.add(send);
+            for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendGoods sendGood : activityPrompt.getSendGoods()) {
+                ActivityList.SendGoods send = new ActivityList.SendGoods();
+                send.setGoodsName(sendGood.getGoodsName());
+                send.setQty(sendGood.getSendNumber());
+                sends.add(send);
+            }
             satisfyList.setSends(sends);
+            satisfyList.setSatisfy(WebUtil.formatAmount(activityPrompt.getThresholdAmount() * 1.00 / 100).toString());
+            satisfyList.setMissing(WebUtil.formatAmount((activityPrompt.getThresholdAmount() - activityPrompt.getTotalAmount()) * 1.00 / 100).toString());
             if (GiftTypeEnum.TYPE_1.equals(activityResponseDto.getActivitySubType())) {
                 satisfyList.setTipType(8);
             }
             else {
                 satisfyList.setTipType(9);
             }
+
         }
         activityList.add(satisfyList);
     }

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

@@ -265,6 +265,7 @@ public class FullSubtractionActivityServiceImpl {
                     // 规则:满5赠奶茶2件，炸鸡1件，满10赠布丁3件，牛奶1份，鸡翅2份，
                     // 提示语：满5元可获赠奶茶*2，炸鸡*1
                     //阶梯满赠
+                    notInShopping.setSatisfy(WebUtil.formatAmount(benefitBeanDto.getThresholdAmount() * 1.00 / 100).toString());
                     if (GiftTypeEnum.TYPE_1.equals(activityResponseDto.getActivitySubType())) {
                         notInShopping.setTipType(6);
                     }