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

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

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

@@ -386,9 +386,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         if (calculationDiscountResult == null) {
             shoppingCartGoodsResponseVo.setProducts(cartGoodsList);
 //            return shoppingCartGoodsResponseVo;
-        }
             sendGoodsQtyCheckForUpdate(cartGoodsList,oldQty,appId,partnerId, userId, storeId,cartGoodsUid, "",shoppingCartBaseService,calculationDiscountResult.getSendGoods());
-
+        }
         ActivityQueryDto activityQueryDto = activityAdapter.getActivityQueryDto(partnerId, storeId, userId, appId, updateShoppingCartGoodsQtyRequestVo.getOrderType());
 
         // 促销活动的优惠金额计算