fix:重新合并代码

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

@@ -428,9 +428,6 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
 
 
         ActivityQueryDto activityQueryDto = activityAdapter.getActivityQueryDto(partnerId, storeId, userId, appId, updateShoppingCartGoodsQtyRequestVo.getOrderType());
-        if (calculationDiscountResult != null) {
-            sendGoodsQtyCheckForUpdate(cartGoodsList, oldQty, appId, partnerId, userId, storeId, cartGoodsUid, "", shoppingCartBaseService, calculationDiscountResult.getSendGoods());
-        }
         if (grayPush(partnerId,storeId,"2")) {
             CalculationSharingDiscountResponseDto.CalculationDiscountResult discountResult = null;
             discountResult = sharingDiscountService.getCalculationSharingDiscountResult(menuType
@@ -460,11 +457,14 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         else {
             // 获取优惠信息
             ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult
-                    =getCalculationDiscountResult(menuType,partnerId,storeId,userId,appId,userLoginInfoDto.getWxAppid(),orderType,assortmentCustomerInfoVo.isMemberPaid(),cartGoodsList,new ArrayList(),new ArrayList<>(),null,deliveryAmount);
+                    = getCalculationDiscountResult(menuType, partnerId, storeId, userId, appId, userLoginInfoDto.getWxAppid(), orderType, assortmentCustomerInfoVo.isMemberPaid(), cartGoodsList, new ArrayList(), new ArrayList<>(), null, deliveryAmount);
             if (calculationDiscountResult == null) {
                 shoppingCartGoodsResponseVo.setProducts(cartGoodsList);
                 //return shoppingCartGoodsResponseVo;
             }
+            if (calculationDiscountResult != null) {
+                sendGoodsQtyCheckForUpdate(cartGoodsList, oldQty, appId, partnerId, userId, storeId, cartGoodsUid, "", shoppingCartBaseService, calculationDiscountResult.getSendGoods());
+            }
             // 促销活动的优惠金额计算
             updateShoppingCartGoodsDiscount(null, activityQueryDto, calculationDiscountResult, cartGoodsList, shoppingCartGoodsResponseVo, null, userLoginInfoDto, updateShoppingCartGoodsQtyRequestVo.getMenuType(), deliveryAmount);
             clearMsg(shoppingCartGoodsResponseVo, cartGoodsUid);