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

@@ -168,7 +168,7 @@ public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelation
         // 获取用户的优惠金额，重新编辑用户提示语
         // 这里比较暴力的做法直接把已经编辑的结合直接删了，重新用一个新的
         // 并且把tip类型设置为5，因为前端针对5直接显示立减文案
-        if(!ObjectUtils.equals(shoppingCartGoodsResponseVo.getTotalDiscountAmount(),0)){
+        if(!ObjectUtils.equals(shoppingCartGoodsResponseVo.getTotalDiscountAmount(),0L)){
 
             ArrayList<ActivityList> activityList = new ArrayList<>();