修复购物车 新算价调用促销返回 无数据, 购物车NPE操作

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>

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

 package cn.freemud.service.impl.calculate;
 
 import cn.freemud.base.entity.BaseResponse;
-import cn.freemud.constant.ApplicationConstant;
 import cn.freemud.constant.ShoppingCartConstant;
 import cn.freemud.demo.entities.bo.goods.CalculationDiscountBO;
 import cn.freemud.demo.entities.bo.goods.ShoppingCartApportionBO;
@@ -400,7 +399,11 @@ public class CalculationCommonService {
         cartGoodsDetailDto.setSkuId(StringUtils.isEmpty(cartGoods.getSkuId()) ? cartGoods.getSpuId() : cartGoods.getSkuId());
         cartGoodsDetailDto.setSkuName(StringUtils.isEmpty(cartGoods.getSkuName()) ? cartGoods.getSpuName() : cartGoods.getSkuName());
         cartGoodsDetailDto.setSkuForeignName(StringUtils.isEmpty(cartGoods.getSkuForeignName()) ? cartGoods.getSpuForeignName() : cartGoods.getSkuForeignName());
+        cartGoodsDetailDto.setIsSendGoods(false);
+        if (calculationGoods!=null) {
+            // 修复购物车NPE 是否为赠品
             cartGoodsDetailDto.setIsSendGoods(ObjectUtils.equals(1, calculationGoods.getCartGoodType()));
+        }
         cartGoodsDetailDto.setOriginalPrice(cartGoods.getOriginalPrice());
         cartGoodsDetailDto.setSalePrice(cartGoods.getOriginalPrice());
         cartGoodsDetailDto.setPicture(cartGoods.getPic());