From be2621d0287d842f27e6b7303b14a01ffc151ac3 Mon Sep 17 00:00:00 2001 From: wb2476 Date: Mon, 15 Apr 2024 14:36:30 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=E5=9F=BA=E7=A1=80=E6=8E=A5=E5=8F=A3ur?= =?UTF-8?q?l=E5=8F=8A=E5=8A=9F=E8=83=BD=E5=8F=B7=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/v2/account/AccountService.java | 16 ++--- .../model/AddPrimAccCompanyRequest.java | 4 +- .../model/AddPrimAccPersonRequest.java | 4 +- .../v2/account/model/DelPrimAccRequest.java | 4 +- .../v2/account/model/InqPrimAccRequest.java | 4 +- .../api/service/v2/bills/BillService.java | 22 ++++-- .../v2/bills/model/BalanceBillRequest.java | 2 +- .../v2/bills/model/CheckBillRequest.java | 2 +- .../v2/bills/model/CheckBillV2Request.java | 72 +++++++++++++++++++ .../v2/bills/model/CheckBillV2Response.java | 40 +++++++++++ .../v2/bills/model/ReturnBillRequest.java | 2 +- .../scfs/api/service/v2/bmd/BmdService.java | 10 +-- .../service/v2/bmd/model/BmdAddRequest.java | 2 +- .../service/v2/bmd/model/BmdDelRequest.java | 2 +- .../service/v2/bmd/model/BmdListRequest.java | 2 +- .../scfs/api/service/v2/pay/PayService.java | 12 ++-- .../v2/pay/model/MerDepositCheckRequest.java | 2 +- .../v2/pay/model/MerDepositRequest.java | 2 +- .../v2/pay/model/MerWithdrawCheckRequest.java | 2 +- .../v2/pay/model/MerWithdrawRequest.java | 2 +- .../v2/pay/model/MerWithdrawV2Request.java | 2 +- 21 files changed, 168 insertions(+), 42 deletions(-) create mode 100644 scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bills/model/CheckBillV2Request.java create mode 100644 scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bills/model/CheckBillV2Response.java diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/AccountService.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/AccountService.java index fa2fc2e..3bfdda4 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/AccountService.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/AccountService.java @@ -218,13 +218,13 @@ public class AccountService { } /** - * 绑定账号新增-个人 + * 个人银行卡绑定 * * @param addPrimAccPersonRequest AddPrimAccRequest * @return AddPrimAccResponse */ public AddPrimAccPersonResponse addPrimAccPerson(AddPrimAccPersonRequest addPrimAccPersonRequest) { - String url = "/accInfo/addPrimAcc"; + String url = "/bank-card/v2/person-bind"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); HttpResponse httpResponse = apiClient.post(url, headers, addPrimAccPersonRequest.toJsonRequest(), AddPrimAccPersonResponse.class); @@ -232,13 +232,13 @@ public class AccountService { } /** - * 绑定账号新增-企业 + * 企业银行账户绑定 * * @param addPrimAccCompanyRequest AddPrimAccPersonRequest * @return AddPrimAccPersonResponse */ public AddPrimAccCompanyResponse addPrimAccCompany(AddPrimAccCompanyRequest addPrimAccCompanyRequest) { - String url = "/accInfo/addPrimAcc"; + String url = "/bank-card/v2/company-bind"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); HttpResponse httpResponse = apiClient.post(url, headers, addPrimAccCompanyRequest.toJsonRequest(), AddPrimAccCompanyResponse.class); @@ -246,13 +246,13 @@ public class AccountService { } /** - * 绑定账号查询 + * 绑定账卡号查询 * * @param inqPrimAccRequest InqPrimAccRequest * @return InqPrimAccResponse */ public InqPrimAccResponse inqPrimAcc(InqPrimAccRequest inqPrimAccRequest) { - String url = "/accInfo/inqPrimAcc"; + String url = "/bank-card/v2/query"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); HttpResponse httpResponse = apiClient.post(url, headers, inqPrimAccRequest.toJsonRequest(), InqPrimAccResponse.class); @@ -274,13 +274,13 @@ public class AccountService { } /** - * 绑定账号删除 + * 银行账卡号解绑 * * @param delPrimAccRequest DelPrimAccRequest * @return DelPrimAccResponse */ public DelPrimAccResponse delPrimAcc(DelPrimAccRequest delPrimAccRequest) { - String url = "/accInfo/delPrimAcc"; + String url = "/bank-card/v2/unbind"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); HttpResponse httpResponse = apiClient.post(url, headers, delPrimAccRequest.toJsonRequest(), DelPrimAccResponse.class); diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/AddPrimAccCompanyRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/AddPrimAccCompanyRequest.java index 6951fb3..5c09d02 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/AddPrimAccCompanyRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/AddPrimAccCompanyRequest.java @@ -7,14 +7,14 @@ import lombok.Data; import lombok.experimental.Accessors; /** - * 绑定账号新增-企业 + * 企业银行账户绑定 * * @author wangwei * @since 2.0.0 */ @Data @Accessors(chain = true) -@TransType("100014") +@TransType("223304") public class AddPrimAccCompanyRequest implements ApiRequest { /** * 渠道编号 diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/AddPrimAccPersonRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/AddPrimAccPersonRequest.java index c81b6d5..9c0b393 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/AddPrimAccPersonRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/AddPrimAccPersonRequest.java @@ -7,14 +7,14 @@ import lombok.Data; import lombok.experimental.Accessors; /** - * 绑定账号新增 + * 个人银行卡绑定 * * @author wangwei * @since 2.0.0 */ @Data @Accessors(chain = true) -@TransType("100014") +@TransType("223303") public class AddPrimAccPersonRequest implements ApiRequest { /** * 渠道编号 diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/DelPrimAccRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/DelPrimAccRequest.java index aeb676e..0abc4c4 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/DelPrimAccRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/DelPrimAccRequest.java @@ -7,14 +7,14 @@ import lombok.Data; import lombok.experimental.Accessors; /** - * 绑定账号删除 + * 银行账卡号解绑 * * @author wangwei * @since 2.0.0 */ @Data @Accessors(chain = true) -@TransType("100015") +@TransType("223305") public class DelPrimAccRequest implements ApiRequest { /** * 渠道编号 diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/InqPrimAccRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/InqPrimAccRequest.java index 8934992..3d06726 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/InqPrimAccRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/InqPrimAccRequest.java @@ -7,14 +7,14 @@ import lombok.Data; import lombok.experimental.Accessors; /** - * 绑定账号查询 + * 绑定账卡号查询 * * @author wangwei * @since 2.0.0 */ @Data @Accessors(chain = true) -@TransType("100016") +@TransType("223306") public class InqPrimAccRequest implements ApiRequest { /** * 渠道编号 diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bills/BillService.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bills/BillService.java index 0973905..60fd935 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bills/BillService.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bills/BillService.java @@ -30,19 +30,33 @@ public class BillService { } /** - * 下载对账文件 + * 回单下载 * * @param returnBillRequest ReturnBillRequest * @return ReturnBillResponse */ public ReturnBillResponse returnBill(ReturnBillRequest returnBillRequest) { - String url = "/download/returnBill"; + String url = "/trade-voucher/v2/download-for-base64"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); HttpResponse httpResponse = apiClient.post(url, headers, returnBillRequest.toJsonRequest(), ReturnBillResponse.class); return httpResponse.getServiceResponse(); } + /** + * 对账单下载（新模板） + * + * @param checkBillV2Request CheckBillV2Request + * @return CheckBillV2Response + */ + public CheckBillV2Response checkBillV2(CheckBillV2Request checkBillV2Request) { + String url = "/download/checkBill"; + HttpHeaders headers = new HttpHeaders(); + headers.addHeader(API_VERSION, V_1); + HttpResponse httpResponse = apiClient.post(url, headers, checkBillV2Request.toJsonRequest(), CheckBillV2Response.class); + return httpResponse.getServiceResponse(); + } + /** * 对账单下载 * @@ -50,7 +64,7 @@ public class BillService { * @return CheckBillResponse */ public CheckBillResponse checkBill(CheckBillRequest checkBillRequest) { - String url = "/download/checkBill"; + String url = "/check-voucher/v1/download-for-base64"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); HttpResponse httpResponse = apiClient.post(url, headers, checkBillRequest.toJsonRequest(), CheckBillResponse.class); @@ -64,7 +78,7 @@ public class BillService { * @return BalanceBillResponse */ public BalanceBillResponse balanceBill(BalanceBillRequest balanceBillRequest) { - String url = "/download/balanceBill"; + String url = "/balance-voucher/v2/download-for-base64"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); HttpResponse httpResponse = apiClient.post(url, headers, balanceBillRequest.toJsonRequest(), BalanceBillResponse.class); diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bills/model/BalanceBillRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bills/model/BalanceBillRequest.java index db2c2bd..c7e89d9 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bills/model/BalanceBillRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bills/model/BalanceBillRequest.java @@ -12,7 +12,7 @@ import lombok.experimental.Accessors; */ @Data @Accessors(chain = true) -@TransType("100037") +@TransType("223212") public class BalanceBillRequest implements ApiRequest { /** * 渠道编号 diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bills/model/CheckBillRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bills/model/CheckBillRequest.java index ecaffee..c391f94 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bills/model/CheckBillRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bills/model/CheckBillRequest.java @@ -8,7 +8,7 @@ import lombok.experimental.Accessors; @Data @Accessors(chain = true) -@TransType("100028") +@TransType("231312") public class CheckBillRequest implements ApiRequest { /** * 渠道编号 diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bills/model/CheckBillV2Request.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bills/model/CheckBillV2Request.java new file mode 100644 index 0000000..298b38b --- /dev/null +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bills/model/CheckBillV2Request.java @@ -0,0 +1,72 @@ +package com.czcb.scfs.api.service.v2.bills.model; + +import com.czcb.scfs.api.core.ApiRequest; +import com.czcb.scfs.api.service.TransType; +import com.google.gson.annotations.SerializedName; +import lombok.Data; +import lombok.experimental.Accessors; + +@Data +@Accessors(chain = true) +@TransType("231313") +public class CheckBillV2Request implements ApiRequest { + /** + * 渠道编号 + */ + @SerializedName("channel_no") + private String channelNo; + + /** + * 应用编号 + */ + @SerializedName("app_no") + private String appNo; + + /** + * 流水号 + */ + @SerializedName("serial_no") + private String serialNo; + + /** + * 下账号 + */ + @SerializedName("account_no") + private String accountNo; + + /** + * 开始日期YYYY-MM-DD + */ + @SerializedName("start_date") + private String startDate; + + /** + * 结束日期YYYY-MM-DD + */ + @SerializedName("end_date") + private String endDate; + + /** + * 操作日期 + */ + @SerializedName("trans_date") + private String transDate; + + /** + * 操作时间 + */ + @SerializedName("trans_tradetime") + private String transTradeTime; + + /** + * 当前页码 默认 0 + */ + @SerializedName("current_page") + private String currentPage; + + /** + * 每页行数 默认 100 + */ + @SerializedName("current_rows") + private String currentRows; +} diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bills/model/CheckBillV2Response.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bills/model/CheckBillV2Response.java new file mode 100644 index 0000000..586584a --- /dev/null +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bills/model/CheckBillV2Response.java @@ -0,0 +1,40 @@ +package com.czcb.scfs.api.service.v2.bills.model; + +import com.czcb.scfs.api.core.ApiResponse; +import com.google.gson.annotations.SerializedName; +import lombok.Data; +import lombok.experimental.Accessors; + +@Data +@Accessors(chain = true) +public class CheckBillV2Response implements ApiResponse { + /** + * 000000：表示成功 + */ + @SerializedName("recode") + private String recode; + + /** + * 结果信息 + */ + @SerializedName("recode_info") + private String recodeInfo; + + /** + * base64编码的zip文件 + */ + @SerializedName("file_data") + private String fileData; + + /** + * 系统日期（YYYY-MM-DD） + */ + @SerializedName("sys_date") + private String sysDate; + + /** + * 系统时间（YYYY-MM-DD hh:mm:ss） + */ + @SerializedName("sys_time") + private String sysTime; +} diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bills/model/ReturnBillRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bills/model/ReturnBillRequest.java index c19e993..b2d1af9 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bills/model/ReturnBillRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bills/model/ReturnBillRequest.java @@ -11,7 +11,7 @@ import lombok.experimental.Accessors; */ @Data @Accessors(chain = true) -@TransType("100027") +@TransType("231311") public class ReturnBillRequest implements ApiRequest { /** * 渠道编号 diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/BmdService.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/BmdService.java index 55abdb1..7c6cd99 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/BmdService.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/BmdService.java @@ -20,13 +20,13 @@ public class BmdService { } /** - * 白名单新增 + * 来账白名单新增 * * @param bmdAddRequest BmdAddRequest * @return BmdAddResponse */ public BmdAddResponse bmdAdd(BmdAddRequest bmdAddRequest) { - String url = "/bmdManager/bmdAdd"; + String url = "/bmd-manager/v2/add"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); HttpResponse httpResponse = apiClient.post(url, headers, bmdAddRequest.toJsonRequest(), BmdAddResponse.class); @@ -34,13 +34,13 @@ public class BmdService { } /** - * 白名单删除 + * 来账白名单删除 * * @param bmdDelRequest BmdDelRequest * @return BmdDelResponse */ public BmdDelResponse bmdDel(BmdDelRequest bmdDelRequest) { - String url = "/bmdManager/bmdDel"; + String url = "/bmd-manager/v2/del"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); HttpResponse httpResponse = apiClient.post(url, headers, bmdDelRequest.toJsonRequest(), BmdDelResponse.class); @@ -54,7 +54,7 @@ public class BmdService { * @return BmdListResponse */ public BmdListResponse bmdList(BmdListRequest bmdListRequest) { - String url = "/bmdManager/bmdList"; + String url = "/bmd-manager/v2/query"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); HttpResponse httpResponse = apiClient.post(url, headers, bmdListRequest.toJsonRequest(), BmdListResponse.class); diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/BmdAddRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/BmdAddRequest.java index 639f52e..e869a07 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/BmdAddRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/BmdAddRequest.java @@ -12,7 +12,7 @@ import lombok.experimental.Accessors; */ @Data @Accessors(chain = true) -@TransType("100023") +@TransType("231403") public class BmdAddRequest implements ApiRequest { /** * 渠道编号 diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/BmdDelRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/BmdDelRequest.java index 8d55b38..9ee9aa9 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/BmdDelRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/BmdDelRequest.java @@ -12,7 +12,7 @@ import lombok.experimental.Accessors; */ @Data @Accessors(chain = true) -@TransType("100024") +@TransType("231404") public class BmdDelRequest implements ApiRequest { /** * 渠道编号 diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/BmdListRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/BmdListRequest.java index 832542d..d25db26 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/BmdListRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/BmdListRequest.java @@ -12,7 +12,7 @@ import lombok.experimental.Accessors; */ @Data @Accessors(chain = true) -@TransType("100025") +@TransType("231405") public class BmdListRequest implements ApiRequest { /** * 渠道编号 diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/PayService.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/PayService.java index aba0057..a973128 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/PayService.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/PayService.java @@ -26,7 +26,7 @@ public class PayService { * @return MerWithdrawResponse */ public MerWithdrawResponse withdraw(MerWithdrawRequest merWithdrawRequest) { - String url = "/merTrade/mer_withdraw"; + String url = "/mer-trade/v2/withdraw"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); HttpResponse httpResponse = apiClient.post(url, headers, merWithdrawRequest.toJsonRequest(), MerWithdrawResponse.class); @@ -34,13 +34,13 @@ public class PayService { } /** - * 提现 + * 提现（平台专用） * * @param merWithdrawV2Request MerWithdrawV2Request * @return MerWithdrawV2Response */ public MerWithdrawV2Response merWithdrawV2(MerWithdrawV2Request merWithdrawV2Request) { - String url = "/merTrade/mer_withdraw_v2"; + String url = "/mer-trade/v2/withdraw-for-platform"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); HttpResponse httpResponse = apiClient.post(url, headers, merWithdrawV2Request.toJsonRequest(), MerWithdrawV2Response.class); @@ -54,7 +54,7 @@ public class PayService { * @return MerWithdrawCheckResponse */ public MerWithdrawCheckResponse withdrawCheck(MerWithdrawCheckRequest merWithdrawCheckRequest) { - String url = "/merTrade/mer_withdraw_check"; + String url = "/mer-trade/v2/withdraw-check"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); HttpResponse httpResponse = apiClient.post(url, headers, merWithdrawCheckRequest.toJsonRequest(), MerWithdrawCheckResponse.class); @@ -68,7 +68,7 @@ public class PayService { * @return MerDepositResponse */ public MerDepositResponse deposit(MerDepositRequest merDepositRequest) { - String url = "/merTrade/mer_deposit"; + String url = "/mer-trade/v2/deposit"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); HttpResponse httpResponse = apiClient.post(url, headers, merDepositRequest.toJsonRequest(), MerDepositResponse.class); @@ -82,7 +82,7 @@ public class PayService { * @return MerDepositCheckResponse */ public MerDepositCheckResponse depositCheck(MerDepositCheckRequest merDepositCheckRequest) { - String url = "/merTrade/mer_deposit_check"; + String url = "/mer-trade/v2/deposit-check"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); HttpResponse httpResponse = apiClient.post(url, headers, merDepositCheckRequest.toJsonRequest(), MerDepositCheckResponse.class); diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/MerDepositCheckRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/MerDepositCheckRequest.java index 8ae44de..e5cd7a2 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/MerDepositCheckRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/MerDepositCheckRequest.java @@ -14,7 +14,7 @@ import lombok.experimental.Accessors; */ @Data @Accessors(chain = true) -@TransType("100021") +@TransType("231002") public class MerDepositCheckRequest implements ApiRequest { /** * 渠道编号 diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/MerDepositRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/MerDepositRequest.java index 7d84046..97ac2db 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/MerDepositRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/MerDepositRequest.java @@ -16,7 +16,7 @@ import java.math.BigDecimal; */ @Data @Accessors(chain = true) -@TransType("100020") +@TransType("231001") public class MerDepositRequest implements ApiRequest { /** * 渠道编号 diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/MerWithdrawCheckRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/MerWithdrawCheckRequest.java index b1d778f..167e486 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/MerWithdrawCheckRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/MerWithdrawCheckRequest.java @@ -14,7 +14,7 @@ import lombok.experimental.Accessors; */ @Data @Accessors(chain = true) -@TransType("100019") +@TransType("231102") public class MerWithdrawCheckRequest implements ApiRequest { /** * 渠道编号 diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/MerWithdrawRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/MerWithdrawRequest.java index e2c1175..2e3f3e5 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/MerWithdrawRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/MerWithdrawRequest.java @@ -16,7 +16,7 @@ import java.math.BigDecimal; */ @Data @Accessors(chain = true) -@TransType("100018") +@TransType("231101") public class MerWithdrawRequest implements ApiRequest { /** * 渠道编号 diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/MerWithdrawV2Request.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/MerWithdrawV2Request.java index 03535d0..0a11d29 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/MerWithdrawV2Request.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/MerWithdrawV2Request.java @@ -14,7 +14,7 @@ import java.math.BigDecimal; */ @Data @Accessors(chain = true) -@TransType("100035") +@TransType("231103") public class MerWithdrawV2Request implements ApiRequest { /** * 渠道编号 From ff8d14e387dedbf2dcf72d5da259a30162fd6d8a Mon Sep 17 00:00:00 2001 From: 13009 Date: Mon, 15 Apr 2024 15:23:43 +0800 Subject: [PATCH 2/4] ref: queryBalance --- .../com/czcb/scfs/api/service/v2/account/AccountService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/AccountService.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/AccountService.java index 4bdba69..b682dfc 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/AccountService.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/AccountService.java @@ -182,7 +182,7 @@ public class AccountService { * @return QueryBalanceResponse */ public QueryBalanceResponse queryBalance(QueryBalanceRequest queryBalanceRequest) { - String url = "/accInfo/queryBalance"; + String url = "/account/v2/query-balance"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); HttpResponse httpResponse = apiClient.post(url, headers, queryBalanceRequest.toJsonRequest(), QueryBalanceResponse.class); From 3b58711d630ecb83107e561f3c4c92d355c9aa06 Mon Sep 17 00:00:00 2001 From: 13009 Date: Mon, 15 Apr 2024 15:24:42 +0800 Subject: [PATCH 3/4] ref: v2 model --- .../boot/starter/ScfsAutoConfiguration.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/scfs-api-spring-boot-starter/src/main/java/com/czcb/scfs/spring/boot/starter/ScfsAutoConfiguration.java b/scfs-api-spring-boot-starter/src/main/java/com/czcb/scfs/spring/boot/starter/ScfsAutoConfiguration.java index 2688350..2d79f11 100644 --- a/scfs-api-spring-boot-starter/src/main/java/com/czcb/scfs/spring/boot/starter/ScfsAutoConfiguration.java +++ b/scfs-api-spring-boot-starter/src/main/java/com/czcb/scfs/spring/boot/starter/ScfsAutoConfiguration.java @@ -4,17 +4,17 @@ import com.czcb.scfs.api.core.ApiClient; import com.czcb.scfs.api.core.Profile; import com.czcb.scfs.api.core.http.ApiClientBuilder; import com.czcb.scfs.api.service.echo.EchoService; -import com.czcb.scfs.api.service.v1.account.AccountService; -import com.czcb.scfs.api.service.v1.bills.BillService; -import com.czcb.scfs.api.service.v1.bmd.BmdService; -import com.czcb.scfs.api.service.v1.coupon.CouponService; -import com.czcb.scfs.api.service.v1.face.FaceService; -import com.czcb.scfs.api.service.v1.file.FileService; -import com.czcb.scfs.api.service.v1.loan.LoanService; -import com.czcb.scfs.api.service.v1.ocr.OcrService; -import com.czcb.scfs.api.service.v1.pay.PayService; -import com.czcb.scfs.api.service.v1.sms.SmsService; -import com.czcb.scfs.api.service.v1.trans.TransService; +import com.czcb.scfs.api.service.v2.account.AccountService; +import com.czcb.scfs.api.service.v2.bills.BillService; +import com.czcb.scfs.api.service.v2.bmd.BmdService; +import com.czcb.scfs.api.service.v2.coupon.CouponService; +import com.czcb.scfs.api.service.v2.face.FaceService; +import com.czcb.scfs.api.service.v2.file.FileService; +import com.czcb.scfs.api.service.v2.loan.LoanService; +import com.czcb.scfs.api.service.v2.ocr.OcrService; +import com.czcb.scfs.api.service.v2.pay.PayService; +import com.czcb.scfs.api.service.v2.sms.SmsService; +import com.czcb.scfs.api.service.v2.trans.TransService; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; From f7c0aaebf8fafdaa163fc0ffb44e10ae4a01e48f Mon Sep 17 00:00:00 2001 From: wb2476 Date: Mon, 15 Apr 2024 15:43:36 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat:=E8=B4=B7=E6=AC=BE=E6=8E=A5=E5=8F=A3ur?= =?UTF-8?q?l=E5=8F=8A=E5=8A=9F=E8=83=BD=E5=8F=B7=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scfs/api/service/v2/loan/LoanService.java | 16 ++++++++-------- .../v2/loan/model/ApplyCompanyRequest.java | 2 +- .../v2/loan/model/ApplyNotifyRequest.java | 2 ++ .../service/v2/loan/model/ApplyQueryRequest.java | 2 +- .../v2/loan/model/ApplyQueryV2Request.java | 4 ++-- .../api/service/v2/loan/model/RepayRequest.java | 2 +- .../v2/loan/model/SignFlowsUrlsRequest.java | 4 ++-- .../czcb/scfs/api/service/v2/pay/PayService.java | 4 ++-- .../v2/pay/model/EarnestInsureRequest.java | 2 +- .../v2/pay/model/EarnestReleaseRequest.java | 2 +- 10 files changed, 21 insertions(+), 19 deletions(-) diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/loan/LoanService.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/loan/LoanService.java index b9a09b9..0f56844 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/loan/LoanService.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/loan/LoanService.java @@ -40,7 +40,7 @@ public class LoanService { * @return ApplyCompanyResponse */ public ApplyCompanyResponse applyCompany(ApplyCompanyRequest applyCompanyRequest) { - String url = "/loanapi/qyapply"; + String url = "/loan/v2/company-apply"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); HttpResponse httpResponse = apiClient.post(url, headers, applyCompanyRequest.toJsonRequest(), ApplyCompanyResponse.class); @@ -54,7 +54,7 @@ public class LoanService { * @return ApplyQueryResponse */ public ApplyQueryResponse applyQuery(ApplyQueryRequest applyQueryRequest) { - String url = "/loanapi/applyquery"; + String url = "/loan/v2/query"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); HttpResponse httpResponse = apiClient.post(url, headers, applyQueryRequest.toJsonRequest(), ApplyQueryResponse.class); @@ -76,13 +76,13 @@ public class LoanService { } /** - * 贷款还款信息查询v2 + * 贷款还款信息查询 * * @param applyQueryV2Request ApplyQueryV2Request * @return ApplyQueryV2Response */ public ApplyQueryV2Response repayQueryV2(ApplyQueryV2Request applyQueryV2Request) { - String url = "/loanapi/v2/repayquery"; + String url = "/loan-repay/v2/query"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); HttpResponse httpResponse = apiClient.post(url, headers, applyQueryV2Request.toJsonRequest(), ApplyQueryV2Response.class); @@ -90,13 +90,13 @@ public class LoanService { } /** - * 贷款还款信息查询 + * 贷款还款（通用） * * @param repayRequest RepayRequest * @return RepayResponse */ public RepayResponse repay(RepayRequest repayRequest) { - String url = "/loanapi/repay"; + String url = "/loan-repay/v2/repayment"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); HttpResponse httpResponse = apiClient.post(url, headers, repayRequest.toJsonRequest(), RepayResponse.class); @@ -104,13 +104,13 @@ public class LoanService { } /** - * 获取流程签署地址列表 + * 获取贷款合同签署页面地址 * * @param signFlowsUrlsRequest SignFlowsUrlsRequest * @return SignFlowsUrlsResponse */ public SignFlowsUrlsResponse signFlowsUrls(SignFlowsUrlsRequest signFlowsUrlsRequest) { - String url = "/loanapi/signFlowsUrls"; + String url = "/loan/v2/sign-urls"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); HttpResponse httpResponse = apiClient.post(url, headers, signFlowsUrlsRequest.toJsonRequest(), SignFlowsUrlsResponse.class); diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/loan/model/ApplyCompanyRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/loan/model/ApplyCompanyRequest.java index b200974..ec935c1 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/loan/model/ApplyCompanyRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/loan/model/ApplyCompanyRequest.java @@ -18,7 +18,7 @@ import java.util.List; */ @Data @Accessors(chain = true) -@TransType("102017") +@TransType("242603") public class ApplyCompanyRequest implements ApiRequest { /** * 渠道编号 diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/loan/model/ApplyNotifyRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/loan/model/ApplyNotifyRequest.java index 6a4a626..e28e380 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/loan/model/ApplyNotifyRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/loan/model/ApplyNotifyRequest.java @@ -1,6 +1,7 @@ package com.czcb.scfs.api.service.v2.loan.model; import com.czcb.scfs.api.core.ApiRequest; +import com.czcb.scfs.api.service.TransType; import com.google.gson.annotations.SerializedName; import lombok.Data; import lombok.experimental.Accessors; @@ -15,6 +16,7 @@ import java.math.BigDecimal; */ @Data @Accessors(chain = true) +@TransType("243601") public class ApplyNotifyRequest implements ApiRequest { /** * 渠道编号 diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/loan/model/ApplyQueryRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/loan/model/ApplyQueryRequest.java index cc2893c..952ea5f 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/loan/model/ApplyQueryRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/loan/model/ApplyQueryRequest.java @@ -14,7 +14,7 @@ import lombok.experimental.Accessors; */ @Data @Accessors(chain = true) -@TransType("102002") +@TransType("242505") public class ApplyQueryRequest implements ApiRequest { /** * 渠道编号 diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/loan/model/ApplyQueryV2Request.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/loan/model/ApplyQueryV2Request.java index 4bed9d3..4370f93 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/loan/model/ApplyQueryV2Request.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/loan/model/ApplyQueryV2Request.java @@ -9,14 +9,14 @@ import lombok.experimental.Accessors; import java.math.BigDecimal; /** - * 贷款还款信息查询V2 + * 贷款还款信息查询 * * @author wangwei * @since 2.0.0 */ @Data @Accessors(chain = true) -@TransType("102002") +@TransType("243203") public class ApplyQueryV2Request implements ApiRequest { /** * 渠道编号 diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/loan/model/RepayRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/loan/model/RepayRequest.java index c92c6c6..ce2ba61 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/loan/model/RepayRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/loan/model/RepayRequest.java @@ -14,7 +14,7 @@ import lombok.experimental.Accessors; */ @Data @Accessors(chain = true) -@TransType("102006") +@TransType("243204") public class RepayRequest implements ApiRequest { /** * 渠道编号 diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/loan/model/SignFlowsUrlsRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/loan/model/SignFlowsUrlsRequest.java index a9fa430..fbd9e21 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/loan/model/SignFlowsUrlsRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/loan/model/SignFlowsUrlsRequest.java @@ -7,14 +7,14 @@ import lombok.Data; import lombok.experimental.Accessors; /** - * 获取流程签署地址列表 + * 获取贷款合同签署页面地址 * * @author wangwei * @since 2.0.0 */ @Data @Accessors(chain = true) -@TransType("102014") +@TransType("242506") public class SignFlowsUrlsRequest implements ApiRequest { /** * 渠道编号 diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/PayService.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/PayService.java index a973128..fbc3cc7 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/PayService.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/PayService.java @@ -110,7 +110,7 @@ public class PayService { * @return EarnestInsureResponse */ public EarnestInsureResponse insure(EarnestInsureRequest earnestInsureRequest) { - String url = "/loanbzjapi/insure"; + String url = "/loan-deposit/v2/insure"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); HttpResponse httpResponse = apiClient.post(url, headers, earnestInsureRequest.toJsonRequest(), EarnestInsureResponse.class); @@ -125,7 +125,7 @@ public class PayService { * @return EarnestReleaseResponse */ public EarnestReleaseResponse release(EarnestReleaseRequest earnestReleaseRequest) { - String url = "/loanbzjapi/repay"; + String url = "/loan-deposit/v2/release"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); HttpResponse httpResponse = apiClient.post(url, headers, earnestReleaseRequest.toJsonRequest(), EarnestReleaseResponse.class); diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/EarnestInsureRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/EarnestInsureRequest.java index 9b647bc..5f14041 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/EarnestInsureRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/EarnestInsureRequest.java @@ -16,7 +16,7 @@ import java.math.BigDecimal; */ @Data @Accessors(chain = true) -@TransType("102010") +@TransType("242403") public class EarnestInsureRequest implements ApiRequest { /** * 渠道编号 diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/EarnestReleaseRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/EarnestReleaseRequest.java index f711048..9ae51a3 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/EarnestReleaseRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/EarnestReleaseRequest.java @@ -16,7 +16,7 @@ import java.math.BigDecimal; */ @Data @Accessors(chain = true) -@TransType("102011") +@TransType("242404") public class EarnestReleaseRequest implements ApiRequest { /** * 渠道编号