From 8fd44d2b69aca5de2775283d7781f388cd3bb3f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=9D=9E=E5=87=A1?= Date: Tue, 31 Mar 2026 03:27:32 +0000 Subject: [PATCH] Merge #82 into master from cc_20260330_fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix:新管家退款单字段补充修改 * cc_20260330_fix: (7 commits squashed) - fix:日志 - fix:问题修复 - fix:闭店二级审批改为运营片区总顾问 - fix:在营和暂停营业允许发起闭店 - fix:新管家支行接口路径修改 - Merge branch 'master' into cc_20260330_fix # Conflicts: # coolstore-partner-service/src/main/java/com/cool/store/service/impl/ThirdXgjServiceImpl.java - fix:新管家退款单字段补充修改 Signed-off-by: 王非凡 Merged-by: 正新 CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/82 --- .../request/close/refund/CloseStoreRefundAddRequest.java | 3 ++- .../com/cool/store/request/xgj/XgjReimburseRequest.java | 6 +----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/close/refund/CloseStoreRefundAddRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/close/refund/CloseStoreRefundAddRequest.java index 3e4926523..e3185ad98 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/close/refund/CloseStoreRefundAddRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/close/refund/CloseStoreRefundAddRequest.java @@ -132,9 +132,10 @@ public class CloseStoreRefundAddRequest { .tradingPartner(businessCode) .cf242("375|其他合法收入——资金退还") .cf243("") + .bankAcctName(businessName) .bankAcctNumber(accountNumber) .bankName(bankName) - .accountType("BANK") + .accountType("PERSONAL") .bankBranchNo(bankBranchNo) .expenseList(Collections.singletonList( XgjReimburseFeeRequest.builder() diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/xgj/XgjReimburseRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/xgj/XgjReimburseRequest.java index f36d5d902..6f5792cfb 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/xgj/XgjReimburseRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/xgj/XgjReimburseRequest.java @@ -94,7 +94,7 @@ public class XgjReimburseRequest { @ApiModelProperty("开户行") private String bankName; - @ApiModelProperty("收款账户类型") + @ApiModelProperty("收款账户类型，个人PERSONAL 公司CORP") private String accountType; @ApiModelProperty("联行号") @@ -102,8 +102,4 @@ public class XgjReimburseRequest { @ApiModelProperty("费用明细") private List expenseList; - - public static void main(String[] args) { - System.out.println(UUIDUtils.get32UUID()); - } }