Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa

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

@@ -127,7 +127,8 @@ public class CalculationSharingDiscountService {
         calculationDiscountGoodsList.removeIf(v->v.getGoodsQuantity().equals(0));
         if (CollectionUtils.isEmpty(calculationDiscountGoodsList)) {
             log.info("calculationDiscountGoodsList:{}", JSON.toJSON(calculationDiscountGoodsList));
-            throw new BizServiceException(ResponseResult.SHOPPING_CART_COUPON_NOT_EXIST,"参数促销计算商品有异常");
+            //throw new BizServiceException(ResponseResult.SHOPPING_CART_COUPON_NOT_EXIST,"参数促销计算商品有异常");
+            return null;
         }
 
         //组装促销