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

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

@@ -351,7 +351,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             setAddAndUpdateResponse(shoppingCartGoodsResponseVo, calculationDiscountResult, allCartGoodsList, null, partnerId, storeId, userId, ShoppingCartConstant.ADD_AND_UPDATE, null);
 
             // 将促销返回的总的活动信息返回给前端
-            shoppingCartGoodsResponseVo.setDiscounts(calculationDiscountResult.getDiscounts());
+            shoppingCartGoodsResponseVo.setDiscounts(calculationDiscountResult.getDiscounts() ==null? null:calculationDiscountResult.getDiscounts());
         }
         //埋点添加购物车行为
         this.buriedPointShoppingCart(addShoppingCartGoodsRequestVo, spuId, productName);
@@ -473,7 +473,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             setAddAndUpdateResponse(shoppingCartGoodsResponseVo, calculationDiscountResult, cartGoodsList, shoppingCartGoodsResponseVo.getToastMsg(), partnerId, storeId, userId, ShoppingCartConstant.ADD_AND_UPDATE, null);
 
             // 将促销返回的总的活动信息返回给前端
-            shoppingCartGoodsResponseVo.setDiscounts(calculationDiscountResult.getDiscounts());
+            shoppingCartGoodsResponseVo.setDiscounts(calculationDiscountResult.getDiscounts() ==null? null:calculationDiscountResult.getDiscounts());
         }
 
         return ResponseUtil.success(shoppingCartGoodsResponseVo);
@@ -632,7 +632,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             this.addNeedCardAmount(shoppingCartInfoRequestVo, shoppingCartGoodsResponseVo);
 
             // 将促销返回的总的活动信息返回给前端
-            shoppingCartGoodsResponseVo.setDiscounts(calculationDiscountResult.getDiscounts());
+            shoppingCartGoodsResponseVo.setDiscounts(calculationDiscountResult.getDiscounts() ==null? null:calculationDiscountResult.getDiscounts());
 
         }
         return ResponseUtil.success(shoppingCartGoodsResponseVo);