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

Merge branches 'feature/20200915_购物车添加限制数量_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

@@ -399,7 +399,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         }
         // 检查购物车商品库存数量
         checkUpdateStock(updateShoppingCartGoodsQtyRequestVo, cartGoods);
-
+        Integer oldQty = cartGoods.getQty();
         // 更新购物车中数量
         List<CartGoods> cartGoodsList = assortmentSdkService.updateGoodsQtyBySdk(partnerId, userId, storeId, cartGoodsUid, qty<0?0:qty, "", shoppingCartBaseService);
 
@@ -452,6 +452,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                 shoppingCartGoodsResponseVo.setProducts(cartGoodsList);
                 //return shoppingCartGoodsResponseVo;
             }
+            sendGoodsQtyCheckForUpdate(cartGoodsList,oldQty,appId,partnerId, userId, storeId,null, cartGoodsUid,shoppingCartBaseService,calculationDiscountResult.getSendGoods());
             sendGoodsQtyCheckForUpdate(cartGoodsList,cartGoods.getQty(),appId,partnerId, userId, storeId,null, cartGoodsUid,shoppingCartBaseService,calculationDiscountResult.getSendGoods());
             // 促销活动的优惠金额计算
             updateShoppingCartGoodsDiscount(null, activityQueryDto, calculationDiscountResult, cartGoodsList, shoppingCartGoodsResponseVo, null, userLoginInfoDto, updateShoppingCartGoodsQtyRequestVo.getMenuType(), deliveryAmount);