From edfda87f9279c70a314904888e415d4b220a3761 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AD=A3=E6=96=B0?= Date: Thu, 16 Apr 2026 01:45:19 +0000 Subject: [PATCH] Merge #101 into master from cc_20250415_fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit feat:认款取消校验 * cc_20250415_fix: (1 commits squashed) - feat:认款取消校验 Signed-off-by: 正新 Merged-by: 正新 CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/101 --- .../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 377d84e88..25fed8327 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 @@ -336,10 +336,10 @@ public class AdjustmentOrderServiceImpl implements AdjustmentOrderService { } // 查询交易流水号是否已被使用 - List existingMappings = expenseMappingDAO.listByTradeNos(request.getTradeNos()); - if (CollectionUtils.isNotEmpty(existingMappings)) { - throw new ServiceException(ErrorCodeEnum.TRADE_EXIST); - } +// List existingMappings = expenseMappingDAO.listByTradeNos(request.getTradeNos()); +// if (CollectionUtils.isNotEmpty(existingMappings)) { +// throw new ServiceException(ErrorCodeEnum.TRADE_EXIST); +// } // 批量插入映射记录 List mappingList = request.getTradeNos().stream()