Merge branch 'feature-yu.sun-20200915-new' into qa

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CalculationServiceImpl.java

@@ -115,7 +115,13 @@ public class CalculationServiceImpl {
 
         List<ActivityCalculationDiscountRequestDto.CalculationDiscountGoods> calculationDiscountGoodsList = new ArrayList<>();
         for (CartGoods cartGoods : cartGoodsList) {
-            addCalculationDiscountGoods(calculationDiscountGoodsList, cartGoods.getCustomerCode(),cartGoods.getGoodsId(), cartGoods.getQty(), cartGoods.getFinalPrice(), cartGoods.getMemberDiscount(),cartGoods);
+            addCalculationDiscountGoods(calculationDiscountGoodsList,
+                    StringUtils.isNotEmpty(cartGoods.getCustomerCode()) ? cartGoods.getCustomerCode() : "",
+                    StringUtils.isNotEmpty(cartGoods.getGoodsId()) ? cartGoods.getGoodsId() : "",
+                    null != cartGoods.getQty() ? cartGoods.getQty() : 0 ,
+                    null != cartGoods.getFinalPrice() ? cartGoods.getFinalPrice() : 0,
+                    null != cartGoods.getMemberDiscount() ? cartGoods.getMemberDiscount() : 0,
+                    cartGoods);
         }
 
         // 当加价购商品不为空时