Merge branch 'feature/20201125_多规格商品下添加单规格商品_yu.sun' into qa

shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java

@@ -287,11 +287,11 @@ public class ShoppingCartConvertAdapter {
                 List<ShoppingCartGoodsDto.CartGoodsDetailDto.MaterialGoods> materialList = new ArrayList<>(0);
                 for (CartGoods.MaterialGoods materialGoods : comboxGoods.getProductMaterialList()) {
                     ShoppingCartGoodsDto.CartGoodsDetailDto.MaterialGoods goods = new ShoppingCartGoodsDto.CartGoodsDetailDto.MaterialGoods();
-                    goods.setSpuId(materialGoods.getSpuId());
-                    goods.setSpuName(materialGoods.getSpuName());
+                    goods.setSpuId(StringUtils.isEmpty(materialGoods.getSpuId())?"":materialGoods.getSpuId());
+                    goods.setSpuName(StringUtils.isEmpty(materialGoods.getSpuName()) ? "":materialGoods.getSpuName());
                     goods.setOriginalPrice(null != materialGoods.getOriginalPrice() ? materialGoods.getOriginalPrice() : 0);
-                    goods.setSalePrice(materialGoods.getFinalPrice());
-                    goods.setQty(cartGoods.getQty());
+                    goods.setSalePrice(null == materialGoods.getFinalPrice() ? materialGoods.getFinalPrice() : 0);
+                    goods.setQty(null == cartGoods.getQty() ? 0 : cartGoods.getQty());
                     goods.setTotalDiscountAmount(0);
                     goods.setProductCode(materialGoods.getCustomerCode());
                     goods.setCustomerCode(materialGoods.getCustomerCode());