From 11cfdf5b90496708730a6359f104585d6e65fe3e Mon Sep 17 00:00:00 2001 From: suzhuhong Date: Wed, 22 Apr 2026 18:31:59 +0800 Subject: [PATCH 1/3] =?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); From 95e6400fa27324cb2a50a0433123229d486ba718 Mon Sep 17 00:00:00 2001 From: suzhuhong Date: Wed, 22 Apr 2026 18:48:38 +0800 Subject: [PATCH 2/3] =?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 --- .../com/cool/store/request/GenerateSplitOrderRequest.java | 8 ++++++++ .../store/service/impl/AdjustmentOrderServiceImpl.java | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/GenerateSplitOrderRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/GenerateSplitOrderRequest.java index d7966a5ae..69f3ac59b 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/GenerateSplitOrderRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/GenerateSplitOrderRequest.java @@ -29,6 +29,14 @@ public class GenerateSplitOrderRequest implements Serializable { @Length(max = 128, message = "收款账户长度不能超过128") private String payeeAccountNo; + @ApiModelProperty("付款账户") + @Length(max = 128, message = "付款账户长度不能超过128") + private String payerAccountName; + + @ApiModelProperty("付款账户") + @Length(max = 128, message = "付款账户长度不能超过128") + private String payerAccountNo; + @ApiModelProperty("分账金额") @NotNull(message = "分账金额不能为空") @DecimalMin(value = "0.01", message = "分账金额必须大于0") 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 6d193be7d..f834c9782 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 @@ -298,8 +298,8 @@ public class AdjustmentOrderServiceImpl implements AdjustmentOrderService { .splitNo(splitNo) .splitType(splitType) .relatedStoreId(adjustmentOrder.getStoreId()) - .payerAccountName(accountInfoDTO.getAccountName()) - .payerAccountNo(accountInfoDTO.getAccountNo()) + .payerAccountName(request.getPayerAccountName()) + .payerAccountNo(request.getPayerAccountNo()) .payeeAccountName(request.getPayeeAccountName()) .payeeAccountNo(request.getPayeeAccountNo()) .expenseTypeCode(adjustmentOrder.getExpenseTypeCode()) From cb1da9a26fd3e1a2e6f9b9732c3f9d2fc7714475 Mon Sep 17 00:00:00 2001 From: suzhuhong Date: Thu, 23 Apr 2026 10:46:02 +0800 Subject: [PATCH 3/3] =?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; }