满减购物车提示语

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

@@ -282,7 +282,7 @@ public class FullPromotionService implements IPromotionService {
         if (Objects.equals(ActivityTypeEnum.TYPE_11.getCode(), activityResponseDto.getActivityType()) || Objects.equals(ActivityTypeEnum.TYPE_12.getCode(), activityResponseDto.getActivityType())) {
             if (activityPrompt.getAlreadyDiscountAmount() == null || activityPrompt.getAlreadyDiscountAmount() == 0) {
 
-                if(ActivityPromptEnum.PreferentialTypeEnum.TO_ORDER_ITEM_QUANTITY.getCode().equals(activityPrompt.getPreferentialType())){
+                if(ActivityPromptEnum.PreferentialTypeEnum.TO_ORDER_ITEM_QUANTITY.getCode().equals(activityResponseDto.getCouponType())){
                     // 满足 X 元/件 减 Y 元 还差 Z元
                     satisfyList.setTipType(ActivityPromptEnum.TipTypeEnum.ELEVEN.getCode());
                     satisfyList.setSatisfy(activityPrompt.getThresholdQuantity().toString());
@@ -305,7 +305,7 @@ public class FullPromotionService implements IPromotionService {
                 } else {
                     toDiscountAmout = activityPrompt.getDiscountAmout();
                 }
-                if(ActivityPromptEnum.PreferentialTypeEnum.TO_ORDER_ITEM_QUANTITY.getCode().equals(activityPrompt.getPreferentialType())){
+                if(ActivityPromptEnum.PreferentialTypeEnum.TO_ORDER_ITEM_QUANTITY.getCode().equals(activityResponseDto.getCouponType())){
                     //已减 X 元 再买 Y 元 减 Z 元
                     satisfyList.setTipType(ActivityPromptEnum.TipTypeEnum.TWELVE.getCode());
                     satisfyList.setDeduct(WebUtil.formatAmount(activityPrompt.getAlreadyDiscountAmount() * 1.00 / 100).toString());

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

@@ -11,6 +11,7 @@ import cn.freemud.entities.vo.ActivityList;
 import cn.freemud.entities.vo.ActivityTip;
 import cn.freemud.entities.vo.CartGoods;
 import cn.freemud.entities.vo.ShoppingCartGoodsResponseVo;
+import cn.freemud.enums.ActivityPromptEnum;
 import cn.freemud.enums.ActivityTypeEnum;
 import cn.freemud.enums.GiftTypeEnum;
 import cn.freemud.service.ActivityService;
@@ -233,6 +234,27 @@ public class FullSharingService {
         }
         BenefitBeanDto benefitBeanDto = benefitBeanDtos.get(0);
         if (Objects.equals(ActivityTypeEnum.TYPE_11.getCode(), activityResponseDto.getActivityType())) {
+
+            if(ActivityPromptEnum.PreferentialTypeEnum.TO_ORDER_ITEM_QUANTITY.getCode().equals(activityResponseDto.getCouponType())){
+                // todo
+                messageBuilder.append("每满 <span style=\"color:#fa5555\">")
+                        .append(benefitBeanDto.getBenefitNumber())
+                        .append("</span>件 减 <span style=\"color:#fa5555\">")
+                        .append(WebUtil.formatAmount(benefitBeanDto.getDiscountAmount() * 1.00 / 100))
+                        .append("</span> ")
+                        .append("最高减 <span style=\"color:#fa5555\">")
+                        .append(WebUtil.formatAmount(activityResponseDto.getMaxMoney() * 1.00 / 100))
+                        .append("</span> 元");
+
+                //满足  x 元 减 Y 元 ，最高 减 Z元
+                ActivityList notInShopping = new ActivityList();
+                notInShopping.setTipType(15);
+                notInShopping.setSatisfy(benefitBeanDto.getBenefitNumber().toString());
+                notInShopping.setDeduct(WebUtil.formatAmount(benefitBeanDto.getDiscountAmount() * 1.00 / 100).toString());
+                notInShopping.setMaxDeduct(WebUtil.formatAmount(activityResponseDto.getMaxMoney() * 1.00 / 100).toString());
+                activityList.add(notInShopping);
+            }else{
+            // todo
             messageBuilder.append("每满 <span style=\"color:#fa5555\">")
                     .append(WebUtil.formatAmount(benefitBeanDto.getThresholdAmount() * 1.00 / 100))
                     .append("</span> 减 <span style=\"color:#fa5555\">")
@@ -249,27 +271,44 @@ public class FullSharingService {
             notInShopping.setDeduct(WebUtil.formatAmount(benefitBeanDto.getDiscountAmount() * 1.00 / 100).toString());
             notInShopping.setMaxDeduct(WebUtil.formatAmount(activityResponseDto.getMaxMoney() * 1.00 / 100).toString());
             activityList.add(notInShopping);
+            }
         }
         else if (Objects.equals(ActivityTypeEnum.TYPE_12.getCode(), activityResponseDto.getActivityType())) {
             int len = benefitBeanDtos.size();
             // // 购物车中无商品或者存在与满减互斥的活动
             for (int i = len - 1; i >= 0; i--) {
                 benefitBeanDto = benefitBeanDtos.get(i);
-                messageBuilder.append("满 <span style=\"color:#fa5555\">")
-                        .append(WebUtil.formatAmount(benefitBeanDto.getThresholdAmount() * 1.00 / 100))
-                        .append("</span> 减 <span style=\"color:#fa5555\">")
-                        .append(WebUtil.formatAmount(benefitBeanDto.getDiscountAmount() * 1.00 / 100))
-                        .append("</span> 元");
+                if(ActivityPromptEnum.PreferentialTypeEnum.TO_ORDER_ITEM_QUANTITY.getCode().equals(activityResponseDto.getCouponType())) {
+                    messageBuilder.append("满 <span style=\"color:#fa5555\">")
+                            .append(benefitBeanDto.getBenefitNumber())
+                            .append("</span>件 减 <span style=\"color:#fa5555\">")
+                            .append(WebUtil.formatAmount(benefitBeanDto.getDiscountAmount() * 1.00 / 100))
+                            .append("</span> 元");
+                }else{
+                    messageBuilder.append("满 <span style=\"color:#fa5555\">")
+                            .append(WebUtil.formatAmount(benefitBeanDto.getThresholdAmount() * 1.00 / 100))
+                            .append("</span> 减 <span style=\"color:#fa5555\">")
+                            .append(WebUtil.formatAmount(benefitBeanDto.getDiscountAmount() * 1.00 / 100))
+                            .append("</span> 元");
+                }
+
                 if (i > 0) messageBuilder.append("，");
             }
             //  阶梯满减：满足 X 元 减 Y 元,
             for (int j = len - 1; j >= 0; j--) {
                 benefitBeanDto = benefitBeanDtos.get(j);
                 ActivityList notInShopping = new ActivityList();
-                notInShopping.setTipType(2);
-                notInShopping.setSatisfy(WebUtil.formatAmount(benefitBeanDto.getThresholdAmount() * 1.00 / 100).toString());
-                notInShopping.setDeduct(WebUtil.formatAmount(benefitBeanDto.getDiscountAmount() * 1.00 / 100).toString());
-                activityList.add(notInShopping);
+                if(ActivityPromptEnum.PreferentialTypeEnum.TO_ORDER_ITEM_QUANTITY.getCode().equals(activityResponseDto.getCouponType())) {
+                    notInShopping.setTipType(16);
+                    notInShopping.setSatisfy(benefitBeanDto.getBenefitNumber().toString());
+                    notInShopping.setDeduct(WebUtil.formatAmount(benefitBeanDto.getDiscountAmount() * 1.00 / 100).toString());
+
+                }else{
+                    notInShopping.setTipType(2);
+                    notInShopping.setSatisfy(WebUtil.formatAmount(benefitBeanDto.getThresholdAmount() * 1.00 / 100).toString());
+                    notInShopping.setDeduct(WebUtil.formatAmount(benefitBeanDto.getDiscountAmount() * 1.00 / 100).toString());
+                }
+                    activityList.add(notInShopping);
             }
         }
         if (Objects.equals(ActivityTypeEnum.TYPE_230.getCode(), activityResponseDto.getActivityType())) {