Merge branches 'feature/20210806_购物车限购数量redis_wuping' and 'qa' of…

Merge branches 'feature/20210806_购物车限购数量redis_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

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

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

@@ -2644,7 +2644,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             qty += cartGoods.getQty();
         }
         int limitCount = queryLimitCount(partnerId,appid);
-        if (qty > limitCount) {
+        if (limitCount != 0 && qty > limitCount) {
             throw new ServiceException(ResponseResult.SHOPPING_CART_LIMIT_ADD);
         }
         return qty;
@@ -2714,7 +2714,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             }
         }
         int cartLimitCount = queryLimitCount(partnerId,appid);
-        if (checkQty + sendQty > cartLimitCount) {
+        if (cartLimitCount != 0 && checkQty + sendQty > cartLimitCount) {
             assortmentSdkService.setShoppingCart(partnerId, storeId, userId, oldCartGoodsList, null, tableNumber, shoppingCartService,bizType);
             throw new ServiceException(ResponseResult.SHOPPING_CART_LIMIT_ADD);
         }
@@ -2740,7 +2740,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                 }
             }
         }
-        if (updateQty + sendQty > cartLimitCount) {
+        if (cartLimitCount != 0 && updateQty + sendQty > cartLimitCount) {
             assortmentSdkService.updateGoodsQtyBySdk(partnerId, userId, storeId, cartGoodsUid, goodsQty, "", shoppingCartBaseService,bizType);
             throw new ServiceException(ResponseResult.SHOPPING_CART_LIMIT_ADD);
         }