From 45766399fdde50a76c54a264cebd304fcd2d813c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AD=A3=E6=96=B0?= Date: Wed, 22 Apr 2026 10:32:23 +0000 Subject: [PATCH] Merge #107 into master from cc_20260422_feeItemId MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix:调增的时候校验 * cc_20260422_feeItemId: (1 commits squashed) - fix:调增的时候校验 Signed-off-by: 正新 Merged-by: 正新 CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/107 --- .../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);