Merge remote-tracking branch 'remotes/origin/feature/1.9.26_加车库存校验' into qa

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

@@ -417,7 +417,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             if ((CollectionUtils.isEmpty(availableStocks.getResult())) || (qty > availableStocks.getResult().get(0).getQty())) {
                 Integer stock = 0;
                 if ((stock = availableStocks.getResult().get(0).getQty()) > 0) {
-                    throw new BizServiceException(ResponseResult.SHOPPING_CART_STOCK_NOT_HAVE, "仅剩" + stock + "件");
+                    throw new BizServiceException(ResponseResult.SHOPPING_CART_STOCK_NOT_HAVE, "仅剩" + stock + "件库存了");
                 }
                 throw new ServiceException(ResponseResult.SHOPPING_CART_STOCK_NOT_HAVE);
             }
@@ -1220,7 +1220,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                         || availableStocks.getResult().get(0).getQty() < qty)) {
             Integer stock = 0;
             if ((stock = availableStocks.getResult().get(0).getQty()) > 0) {
-                throw new BizServiceException(ResponseResult.SHOPPING_CART_STOCK_NOT_HAVE, "仅剩" + stock + "件");
+                throw new BizServiceException(ResponseResult.SHOPPING_CART_STOCK_NOT_HAVE, "仅剩" + stock + "件库存了");
             }
             throw new ServiceException(ResponseResult.SHOPPING_CART_STOCK_NOT_HAVE);
         }
@@ -1534,7 +1534,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
      */
     private Integer checkSkuQty(List<CartGoods> allCartGoodsList, CartGoods cartGoods) {
         Integer qty = 0;
-        if (allCartGoodsList == null) {
+        if (CollectionUtils.isEmpty(allCartGoodsList)) {
             qty = cartGoods.getQty();
         } else {
             for (CartGoods goods : allCartGoodsList) {