From 11cfdf5b90496708730a6359f104585d6e65fe3e Mon Sep 17 00:00:00 2001 From: suzhuhong Date: Wed, 22 Apr 2026 18:31:59 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E8=B0=83=E5=A2=9E=E7=9A=84=E6=97=B6?= =?UTF-8?q?=E5=80=99=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/service/impl/AdjustmentOrderServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AdjustmentOrderServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AdjustmentOrderServiceImpl.java index c38d9a630..6d193be7d 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AdjustmentOrderServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AdjustmentOrderServiceImpl.java @@ -324,16 +324,16 @@ public class AdjustmentOrderServiceImpl implements AdjustmentOrderService { throw new ServiceException(ErrorCodeEnum.CHANGE_ID_NOT_NULL); } - if (CollectionUtils.isEmpty(request.getTradeNos())) { - throw new ServiceException(ErrorCodeEnum.ERROR_MESSAGE, "交易流水号列表不能为空"); - } - // 查询费用调整单 AdjustmentOrderDO adjustmentOrder = adjustmentOrderDAO.getById(request.getId()); if (adjustmentOrder == null) { throw new ServiceException(ErrorCodeEnum.CHANGE_NOT_NULL); } + if (CollectionUtils.isEmpty(request.getTradeNos())&&adjustmentOrder.getAdjustType()==1) { + throw new ServiceException(ErrorCodeEnum.ERROR_MESSAGE, "交易流水号列表不能为空"); + } + // 只有待充值待认款状态才能进行认款操作 if (!(DOC_STATUS_2.getStatus().equals(adjustmentOrder.getStatus())||DOC_STATUS_1.getStatus().equals(adjustmentOrder.getStatus()))) { throw new ServiceException(ErrorCodeEnum.NOT_SUPPORT_OPERATION);