Merge branch 'feature/20201228_可用券信息查询NPE修复_yu.sun'

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

@@ -452,32 +452,36 @@ public class CouponDiscountCalculation {
 
     private Long createProductRequest(List<CartGoods> cartGoods, List<CouponProductVo> productList) {
         Long totalAmount = 0L;
-        for (CartGoods cartGood : cartGoods) {
-            // 剔除商品券得商品
-            if (StringUtils.isEmpty(cartGood.getSkuId()) && StringUtils.isEmpty(cartGood.getSpuId())) {
-                continue;
-            }
-            // 剔除商品券得商品,麦咖啡逻辑
-            if(StringUtils.isNotEmpty(cartGood.getCouponCode())){
-                continue;
-            }
-            CouponProductVo product = new CouponProductVo();
-            product.setKeyProductCode(cartGood.getCustomerCode());
-            product.setProductId(StringUtils.isEmpty(cartGood.getSkuId()) ? cartGood.getSpuId() : cartGood.getSkuId());
-            // 普通商品价格
-            product.setAmount(Integer.valueOf(cartGood.getOriginalPrice() + ""));
-            // 套餐价格为： 套餐价+可选商品总价格
-            if (ObjectUtils.equals(GoodsTypeEnum.SET_MEAL_GOODS.getGoodsType(), cartGood.getGoodsType())) {
-                Long finalPrice = cartGood.getFinalPrice();
-                if (CollectionUtils.isNotEmpty(cartGood.getProductGroupList())){
-                    finalPrice+=cartGood.getProductGroupList().stream().mapToLong(group->group.getFinalPrice()*group.getQty()).sum();
+        try {
+            for (CartGoods cartGood : cartGoods) {
+                // 剔除商品券得商品
+                if (StringUtils.isEmpty(cartGood.getSkuId()) && StringUtils.isEmpty(cartGood.getSpuId())) {
+                    continue;
+                }
+                // 剔除商品券得商品,麦咖啡逻辑
+                if(StringUtils.isNotEmpty(cartGood.getCouponCode())){
+                    continue;
+                }
+                CouponProductVo product = new CouponProductVo();
+                product.setKeyProductCode(cartGood.getCustomerCode());
+                product.setProductId(StringUtils.isEmpty(cartGood.getSkuId()) ? cartGood.getSpuId() : cartGood.getSkuId());
+                // 普通商品价格
+                product.setAmount(Integer.valueOf(cartGood.getOriginalPrice() + ""));
+                // 套餐价格为： 套餐价+可选商品总价格
+                if (ObjectUtils.equals(GoodsTypeEnum.SET_MEAL_GOODS.getGoodsType(), cartGood.getGoodsType())) {
+                    Long finalPrice = cartGood.getFinalPrice();
+                    if (CollectionUtils.isNotEmpty(cartGood.getProductGroupList())){
+                        finalPrice+=cartGood.getProductGroupList().stream().mapToLong(group->group.getFinalPrice()*group.getQty()).sum();
+                    }
+                    product.setAmount(finalPrice.intValue());
                 }
-                product.setAmount(finalPrice.intValue());
+                // 数量
+                product.setQuantity(cartGood.getQty());
+                productList.add(product);
+                totalAmount = totalAmount +product.getAmount() * cartGood.getQty();
             }
-            // 数量
-            product.setQuantity(cartGood.getQty());
-            productList.add(product);
-            totalAmount = totalAmount +product.getAmount() * cartGood.getQty();
+        } catch (NumberFormatException e) {
+            throw new ServiceException(ResponseResult.SYSTEM_ERROR);
         }
         return totalAmount;
     }