Merge branches 'feature/20200915_购物车添加限制数量_wuping' and 'master' of…

Merge branches 'feature/20200915_购物车添加限制数量_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

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

@@ -383,7 +383,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             shoppingCartGoodsResponseVo.setProducts(cartGoodsList);
 //            return shoppingCartGoodsResponseVo;
         }
-        if (calculationDiscountResult != null && CollectionUtils.isNotEmpty(calculationDiscountResult.getSendGoods())) {
+        if (calculationDiscountResult != null) {
             sendGoodsQtyCheckForUpdate(cartGoodsList, oldQty, appId, partnerId, userId, storeId, cartGoodsUid, "", shoppingCartBaseService, calculationDiscountResult.getSendGoods());
         }
         ActivityQueryDto activityQueryDto = activityAdapter.getActivityQueryDto(partnerId, storeId, userId, appId, updateShoppingCartGoodsQtyRequestVo.getOrderType());