Commit 9c4e27ba by 刘鹏飞

将促销返回的总的活动信息返回给前端,需要判空

parent dcb5f8d8
...@@ -351,7 +351,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService { ...@@ -351,7 +351,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
setAddAndUpdateResponse(shoppingCartGoodsResponseVo, calculationDiscountResult, allCartGoodsList, null, partnerId, storeId, userId, ShoppingCartConstant.ADD_AND_UPDATE, null); setAddAndUpdateResponse(shoppingCartGoodsResponseVo, calculationDiscountResult, allCartGoodsList, null, partnerId, storeId, userId, ShoppingCartConstant.ADD_AND_UPDATE, null);
// 将促销返回的总的活动信息返回给前端 // 将促销返回的总的活动信息返回给前端
shoppingCartGoodsResponseVo.setDiscounts(calculationDiscountResult.getDiscounts() ==null? null:calculationDiscountResult.getDiscounts()); shoppingCartGoodsResponseVo.setDiscounts(calculationDiscountResult == null ? null : calculationDiscountResult.getDiscounts());
} }
//埋点添加购物车行为 //埋点添加购物车行为
this.buriedPointShoppingCart(addShoppingCartGoodsRequestVo, spuId, productName); this.buriedPointShoppingCart(addShoppingCartGoodsRequestVo, spuId, productName);
...@@ -473,7 +473,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService { ...@@ -473,7 +473,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
setAddAndUpdateResponse(shoppingCartGoodsResponseVo, calculationDiscountResult, cartGoodsList, shoppingCartGoodsResponseVo.getToastMsg(), partnerId, storeId, userId, ShoppingCartConstant.ADD_AND_UPDATE, null); setAddAndUpdateResponse(shoppingCartGoodsResponseVo, calculationDiscountResult, cartGoodsList, shoppingCartGoodsResponseVo.getToastMsg(), partnerId, storeId, userId, ShoppingCartConstant.ADD_AND_UPDATE, null);
// 将促销返回的总的活动信息返回给前端 // 将促销返回的总的活动信息返回给前端
shoppingCartGoodsResponseVo.setDiscounts(calculationDiscountResult.getDiscounts() ==null? null:calculationDiscountResult.getDiscounts()); shoppingCartGoodsResponseVo.setDiscounts(calculationDiscountResult == null ? null : calculationDiscountResult.getDiscounts());
} }
return ResponseUtil.success(shoppingCartGoodsResponseVo); return ResponseUtil.success(shoppingCartGoodsResponseVo);
...@@ -632,7 +632,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService { ...@@ -632,7 +632,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
this.addNeedCardAmount(shoppingCartInfoRequestVo, shoppingCartGoodsResponseVo); this.addNeedCardAmount(shoppingCartInfoRequestVo, shoppingCartGoodsResponseVo);
// 将促销返回的总的活动信息返回给前端 // 将促销返回的总的活动信息返回给前端
shoppingCartGoodsResponseVo.setDiscounts(calculationDiscountResult.getDiscounts() ==null? null:calculationDiscountResult.getDiscounts()); shoppingCartGoodsResponseVo.setDiscounts(calculationDiscountResult == null ? null : calculationDiscountResult.getDiscounts());
} }
return ResponseUtil.success(shoppingCartGoodsResponseVo); return ResponseUtil.success(shoppingCartGoodsResponseVo);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment