Merge #82 into master from cc_20260330_fix
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: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>
CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/82
This commit is contained in:
@@ -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()
|
||||
|
||||
@@ -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<XgjReimburseFeeRequest> expenseList;
|
||||
|
||||
public static void main(String[] args) {
|
||||
System.out.println(UUIDUtils.get32UUID());
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user