modify:新的促销提示语

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

 package cn.freemud.service.impl.calculate.promotion;
 
+import cn.freemud.entities.dto.ActivityCalculationDiscountResponseDto;
 import cn.freemud.entities.dto.ActivityResponseDto;
 import cn.freemud.entities.dto.BenefitBeanDto;
 import cn.freemud.entities.dto.PromotionMessageDto;
@@ -291,8 +292,8 @@ public class FullSharingService {
                 List<ActivityList.SendGoods> sends = new ArrayList();
                 for (int i = len - 1; i >= 0; i--) {
                     ActivityList.SendGoods goods = new ActivityList.SendGoods();
-                    goods.setQty(goods.getQty());
-                    goods.setGoodsName(goods.getGoodsName());
+                    goods.setQty(beanDto.getSendGoodsList().get(i).getSendNumber());
+                    goods.setGoodsName(beanDto.getSendGoodsList().get(i).getGoodsName());
                     sends.add(goods);
                 }
                 notInShopping.setSends(sends);
@@ -313,8 +314,8 @@ public class FullSharingService {
 
         ActivityList satisfyList = new ActivityList();
         CalculationSharingDiscountResponseDto.CalculationDiscountResult.ActivityPrompt activityPrompt = activityPrompts.get(0);
-        if (activityPrompt.getAlreadyDiscountAmount() == null
-                || activityPrompt.getAlreadyDiscountAmount() == 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\">")
                         .append(WebUtil.formatAmount(activityPrompt.getThresholdAmount() * 1.00 / 100))
                         .append("</span> 减 <span style=\"color:#fa5555\">")
@@ -348,22 +349,34 @@ public class FullSharingService {
                 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);
-            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();
+            for (CalculationSharingDiscountResponseDto.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);
             }
+            if (activityPrompt.getTotalAmount()>=activityPrompt.getThresholdAmount()) {
+                if (GiftTypeEnum.TYPE_1.equals(activityResponseDto.getActivitySubType())) {
+                    satisfyList.setTipType(6);
+                }
+                else {
+                    satisfyList.setTipType(6);
+                }
+            }
         }
         activityList.add(satisfyList);
     }