Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa

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

@@ -16,10 +16,7 @@ package cn.freemud.service.shoppingCart.impl;
 import cn.freemud.adapter.ActivityAdapter;
 import cn.freemud.entities.dto.PromotionMessageDto;
 import cn.freemud.entities.dto.calculate.CalculationSharingDiscountResponseDto;
-import cn.freemud.entities.vo.ActivityTip;
-import cn.freemud.entities.vo.CartGoods;
-import cn.freemud.entities.vo.ShoppingCartClearRequestVo;
-import cn.freemud.entities.vo.ShoppingCartGoodsResponseVo;
+import cn.freemud.entities.vo.*;
 import cn.freemud.enums.ActivityTypeEnum;
 import cn.freemud.service.impl.ShoppingCartNewServiceImpl;
 import cn.freemud.service.shoppingCart.ShoppingCartRelationService;
@@ -169,14 +166,22 @@ public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelation
 
         // 购物车顶部的提示不只是满减的提示，只要用户参加了活动，就应该把优惠的金额放到上面
         // 获取用户的优惠金额，重新编辑用户提示语
+        // 这里比较暴力的做法直接把已经编辑的结合直接删了，重新用一个新的
+        // 并且把tip类型设置为5，因为前端针对5直接显示立减文案
         if(!ObjectUtils.equals(shoppingCartGoodsResponseVo.getTotalDiscountAmount(),0)){
 
+            ArrayList<ActivityList> activityList = new ArrayList<>();
+
+            ActivityList notInShopping = new ActivityList();
+            notInShopping.setTipType(5);
+            // 直接取出整车的优惠
+            notInShopping.setDeduct(WebUtil.formatAmount(shoppingCartGoodsResponseVo.getTotalDiscountAmount() * 1.00 / 100).toString());
+            activityList.add(notInShopping);
+
             ActivityTip activityTip = shoppingCartGoodsResponseVo.getActivityTip();
-            StringBuilder messageBuilder = new StringBuilder();
+            activityTip.setActivityList(activityList);
 
-            messageBuilder.append("立减 <span style=\"color:#fa5555\">")
-                    .append(WebUtil.formatAmount(shoppingCartGoodsResponseVo.getTotalDiscountAmount() * 1.00 / 100))
-                    .append("</span> 元");
+            activityTip.setActivityList(activityList);
 
             shoppingCartGoodsResponseVo.setActivityTip(activityTip);
         }