From 18d5e9c3dddce3a21d06ed7918c258dc636764bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AD=A3=E6=96=B0?= Date: Wed, 22 Apr 2026 10:49:03 +0000 Subject: [PATCH] Merge #108 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: (2 commits squashed) - fix:调增的时候校验 - fix:调增的时候校验 Signed-off-by: 正新 Merged-by: 正新 CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/108 --- .../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())