From cb1da9a26fd3e1a2e6f9b9732c3f9d2fc7714475 Mon Sep 17 00:00:00 2001 From: suzhuhong Date: Thu, 23 Apr 2026 10:46:02 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=85=B3=E8=81=94=E5=88=86=E8=B4=A6?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/service/AdjustmentOrderService.java | 2 +- .../cool/store/service/impl/AdjustmentOrderServiceImpl.java | 4 ++-- .../com/cool/store/service/impl/SplitOrderServiceImpl.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/AdjustmentOrderService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/AdjustmentOrderService.java index a9b41de52..f3477c8d3 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/AdjustmentOrderService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/AdjustmentOrderService.java @@ -72,7 +72,7 @@ public interface AdjustmentOrderService { * @param transferAmount * @return */ - Boolean calculateAmount(Long id ,String transferAmount); + Boolean calculateAmount(String no ,String transferAmount); /** * 确认充值 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 f834c9782..057a8994b 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 @@ -371,8 +371,8 @@ public class AdjustmentOrderServiceImpl implements AdjustmentOrderService { } @Override - public Boolean calculateAmount(Long id, String transferAmount) { - AdjustmentOrderDO adjustmentOrderDO = adjustmentOrderDAO.getById(id); + public Boolean calculateAmount(String no, String transferAmount) { + AdjustmentOrderDO adjustmentOrderDO = adjustmentOrderDAO.getByAdjustmentNo(no); if (adjustmentOrderDO==null){ log.info("calculateAmount:费用单/费用调整单为空"); return Boolean.FALSE; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SplitOrderServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SplitOrderServiceImpl.java index 8e41f2204..a8f406038 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SplitOrderServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SplitOrderServiceImpl.java @@ -272,7 +272,7 @@ public class SplitOrderServiceImpl implements SplitOrderService { //如果是分账完成 需要变更单据已分账金额 if (AllocationPayStatusEnum.PAID.getStatus().equals(accountTransferDTO.getTradeStatus())){ log.info("confirmSplitOrder 分账完成分账单ID：{}",id); - adjustmentOrderService.calculateAmount(id,accountTransferDTO.getAmount()); + adjustmentOrderService.calculateAmount(existing.getRelatedDocNo(),accountTransferDTO.getAmount()); } return result > 0; } @@ -313,7 +313,7 @@ public class SplitOrderServiceImpl implements SplitOrderService { splitOrderDAO.update(split); if (AllocationPayStatusEnum.PAID.getStatus().equals(billDetail.getTradeStatus())){ log.info("confirmSplitOrder 分账完成分账单ID：{}",split.getId()); - adjustmentOrderService.calculateAmount(split.getId(),billDetail.getAmount()); + adjustmentOrderService.calculateAmount(split.getRelatedDocNo(),billDetail.getAmount()); } return null; }