Merge branch 'ka-商品技术需求购物车不校验商品库存'

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

@@ -2368,11 +2368,19 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         requestDto.setStoreId(addShoppingCartGoodsRequestVo.getShopId());
         requestDto.setProductIds(productIds);
         GetProductStockResponseDto availableStocks = stockClient.getAvailableStocks(requestDto);
-        if (availableStocks == null || !ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(availableStocks.getCode())) {
+        // 商品服务  返回null 或者 qty=null 表示不限制库存
+        if (Objects.isNull(availableStocks)) {
+            return;
+        }
+        // 商品服务  返回null 或者 qty=null 表示不限制库存
+        List<GetProductStockResponseDto.DataBean> result = availableStocks.getResult();
+        if (CollectionUtils.isEmpty(result) || Objects.isNull(result.get(0).getQty())) {
+            return;
+        }
+        if (!ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(availableStocks.getCode())) {
             throw new ServiceException(ResponseResult.SHOPPING_CART_STOCK_NOT_HAVE);
         }
-        int stock = CollectionUtils.isEmpty(availableStocks.getResult()) || availableStocks.getResult().get(0).getQty() == null ? 0 :
-                availableStocks.getResult().get(0).getQty();
+        int stock = availableStocks.getResult().get(0).getQty();
         if (stock <= 0) {
             throw new ServiceException(ResponseResult.SHOPPING_CART_STOCK_NOT_HAVE);
         } else if (stock < qty) {