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

@@ -14,13 +14,16 @@
 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.enums.ActivityTypeEnum;
 import cn.freemud.service.impl.ShoppingCartNewServiceImpl;
 import cn.freemud.service.shoppingCart.ShoppingCartRelationService;
+import cn.freemud.utils.WebUtil;
 import com.freemud.application.sdk.api.log.ApiLog;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.google.common.collect.Lists;
@@ -163,6 +166,20 @@ public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelation
                 shoppingCartGoodsResponseVo.setProducts(newProducts);
             }
         }
+
+        // 购物车顶部的提示不只是满减的提示，只要用户参加了活动，就应该把优惠的金额放到上面
+        // 获取用户的优惠金额，重新编辑用户提示语
+        if(!ObjectUtils.equals(shoppingCartGoodsResponseVo.getTotalDiscountAmount(),0)){
+
+            ActivityTip activityTip = shoppingCartGoodsResponseVo.getActivityTip();
+            StringBuilder messageBuilder = new StringBuilder();
+
+            messageBuilder.append("立减 <span style=\"color:#fa5555\">")
+                    .append(WebUtil.formatAmount(shoppingCartGoodsResponseVo.getTotalDiscountAmount() * 1.00 / 100))
+                    .append("</span> 元");
+
+            shoppingCartGoodsResponseVo.setActivityTip(activityTip);
+        }
     }
 
     @Override