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

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

@@ -452,6 +452,7 @@ public class CouponDiscountCalculation {
 
     private Long createProductRequest(List<CartGoods> cartGoods, List<CouponProductVo> productList) {
         Long totalAmount = 0L;
+        try {
             for (CartGoods cartGood : cartGoods) {
                 // 剔除商品券得商品
                 if (StringUtils.isEmpty(cartGood.getSkuId()) && StringUtils.isEmpty(cartGood.getSpuId())) {
@@ -479,6 +480,9 @@ public class CouponDiscountCalculation {
                 productList.add(product);
                 totalAmount = totalAmount +product.getAmount() * cartGood.getQty();
             }
+        } catch (NumberFormatException e) {
+            throw new ServiceException(ResponseResult.SYSTEM_ERROR);
+        }
         return totalAmount;
     }