From 4868fe25f59bdd781bbc76f0764fa3fb7be6afc6 Mon Sep 17 00:00:00 2001 From: 13009 Date: Thu, 18 Apr 2024 16:08:58 +0800 Subject: [PATCH] ref: v2 model --- .../scfs/api/service/v1/loan/LoanService.java | 6 +- .../service/v2/account/AccountService.java | 77 ++++--------------- ...Request.java => BankCardQueryRequest.java} | 2 +- ...sponse.java => BankCardQueryResponse.java} | 2 +- ...nyRequest.java => CompanyBindRequest.java} | 2 +- ...Response.java => CompanyBindResponse.java} | 2 +- ...sonRequest.java => PersonBindRequest.java} | 2 +- ...nResponse.java => PersonBindResponse.java} | 2 +- ...PrimAccRequest.java => UnbindRequest.java} | 2 +- .../api/service/v2/bills/BillService.java | 24 +++--- ...java => BalanceBalanceVoucherRequest.java} | 2 +- ...ava => BalanceBalanceVoucherResponse.java} | 2 +- ....java => CheckVoucherDownloadRequest.java} | 2 +- ...java => CheckVoucherDownloadResponse.java} | 2 +- ....java => TradeVoucherDownloadRequest.java} | 2 +- ...java => TradeVoucherDownloadResponse.java} | 2 +- .../scfs/api/service/v2/bmd/BmdService.java | 26 +++---- ...dListRequest.java => BmdQueryRequest.java} | 2 +- ...istResponse.java => BmdQueryResponse.java} | 2 +- ...AddRequest.java => LoanBmdAddRequest.java} | 2 +- ...dResponse.java => LoanBmdAddResponse.java} | 2 +- ...DelRequest.java => LoanBmdDelRequest.java} | 2 +- ...lResponse.java => LoanBmdDelResponse.java} | 2 +- ...yRequest.java => LoanBmdQueryRequest.java} | 2 +- ...esponse.java => LoanBmdQueryResponse.java} | 2 +- .../scfs/api/service/v2/loan/LoanService.java | 38 ++++----- ...equest.java => LoanRepayQueryRequest.java} | 2 +- ...ponse.java => LoanRepayQueryResponse.java} | 2 +- .../scfs/api/service/v2/pay/PayService.java | 8 +- ...ava => MerWithdrawForPlatformRequest.java} | 2 +- ...va => MerWithdrawForPlatformResponse.java} | 2 +- .../api/service/v2/trans/TransService.java | 15 ++-- ...a => QueryTradeDetailsHistoryRequest.java} | 4 +- ... => QueryTradeDetailsHistoryResponse.java} | 6 +- ...est.java => QueryTradeDetailsRequest.java} | 2 +- ...se.java => QueryTradeDetailsResponse.java} | 2 +- .../czcb/scfs/api/test/ApiGatewayTest.java | 16 ++-- 37 files changed, 116 insertions(+), 158 deletions(-) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/{InqPrimAccRequest.java => BankCardQueryRequest.java} (94%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/{InqPrimAccResponse.java => BankCardQueryResponse.java} (97%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/{AddPrimAccCompanyRequest.java => CompanyBindRequest.java} (97%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/{AddPrimAccCompanyResponse.java => CompanyBindResponse.java} (92%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/{AddPrimAccPersonRequest.java => PersonBindRequest.java} (97%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/{AddPrimAccPersonResponse.java => PersonBindResponse.java} (92%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/{DelPrimAccRequest.java => UnbindRequest.java} (95%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bills/model/{BalanceBillRequest.java => BalanceBalanceVoucherRequest.java} (94%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bills/model/{BalanceBillResponse.java => BalanceBalanceVoucherResponse.java} (96%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bills/model/{CheckBillRequest.java => CheckVoucherDownloadRequest.java} (94%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bills/model/{CheckBillResponse.java => CheckVoucherDownloadResponse.java} (92%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bills/model/{ReturnBillRequest.java => TradeVoucherDownloadRequest.java} (94%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bills/model/{ReturnBillResponse.java => TradeVoucherDownloadResponse.java} (95%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/{BmdListRequest.java => BmdQueryRequest.java} (94%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/{BmdListResponse.java => BmdQueryResponse.java} (96%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/{ApplyBmdAddRequest.java => LoanBmdAddRequest.java} (97%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/{ApplyBmdAddResponse.java => LoanBmdAddResponse.java} (92%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/{ApplyBmdDelRequest.java => LoanBmdDelRequest.java} (94%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/{ApplyBmdDelResponse.java => LoanBmdDelResponse.java} (92%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/{ApplyBmdQueryRequest.java => LoanBmdQueryRequest.java} (94%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/{ApplyBmdQueryResponse.java => LoanBmdQueryResponse.java} (98%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/loan/model/{ApplyQueryV2Request.java => LoanRepayQueryRequest.java} (96%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/loan/model/{ApplyQueryV2Response.java => LoanRepayQueryResponse.java} (98%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/{MerWithdrawV2Request.java => MerWithdrawForPlatformRequest.java} (96%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/{MerWithdrawV2Response.java => MerWithdrawForPlatformResponse.java} (95%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/trans/model/{QueryHistoryRequest.java => QueryTradeDetailsHistoryRequest.java} (93%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/trans/model/{QueryHistoryResponse.java => QueryTradeDetailsHistoryResponse.java} (97%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/trans/model/{QueryTradeListNewRequest.java => QueryTradeDetailsRequest.java} (95%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/trans/model/{QueryTradeListNewResponse.java => QueryTradeDetailsResponse.java} (98%) diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/loan/LoanService.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/loan/LoanService.java index e2235c9..9a39428 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/loan/LoanService.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/loan/LoanService.java @@ -26,7 +26,7 @@ public class LoanService { * @return ApplyPersonResponse */ public ApplyPersonResponse applyPerson(ApplyPersonRequest applyPersonRequest) { - String url = "/loan/v2/person-apply"; + String url = "/loanapi/apply"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); HttpResponse httpResponse = apiClient.post(url, headers, applyPersonRequest.toJsonRequest(), ApplyPersonResponse.class); @@ -40,7 +40,7 @@ public class LoanService { * @return ApplyCompanyResponse */ public ApplyCompanyResponse applyCompany(ApplyCompanyRequest applyCompanyRequest) { - String url = "/loan/v2/company-apply"; + String url = "/loanapi/qyapply"; 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 = "/loan/v2/query"; + String url = "/loanapi/applyquery"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); HttpResponse httpResponse = apiClient.post(url, headers, applyQueryRequest.toJsonRequest(), ApplyQueryResponse.class); 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 3bfdda4..a54658f 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 @@ -3,7 +3,6 @@ package com.czcb.scfs.api.service.v2.account; import com.czcb.scfs.api.core.ApiClient; import com.czcb.scfs.api.core.http.HttpHeaders; import com.czcb.scfs.api.core.http.HttpResponse; -import com.czcb.scfs.api.service.v1.account.model.OpenAccAllPersonResponse; import com.czcb.scfs.api.service.v2.account.model.*; import static com.czcb.scfs.api.core.Constants.API_VERSION; @@ -35,20 +34,6 @@ public class AccountService { return httpResponse.getServiceResponse(); } - /** - * 电子登记簿账户开户-个人 - * - * @param createAccountRequest CreateAccountRequest - * @return CreateAccountResponse - */ - public CreateAccountResponse createAccount(CreateAccountRequest createAccountRequest) { - String url = "/accInfo/v2/createAccount"; - HttpHeaders headers = new HttpHeaders(); - headers.addHeader(API_VERSION, V_1); - HttpResponse httpResponse = apiClient.post(url, headers, createAccountRequest.toJsonRequest(), CreateAccountResponse.class); - return httpResponse.getServiceResponse(); - } - /** * 个人账户开户（三要素） */ @@ -75,21 +60,6 @@ public class AccountService { return httpResponse.getServiceResponse(); } - /** - * 开立客户全部电子登记簿账户（主账户和从账户） 个人 - * - * @param openAccAllPersonRequest OpenAccAllPersonRequest - * @return OpenAccAllPersonResponse - */ - @Deprecated - public OpenAccAllPersonResponse openAccAllPerson(OpenAccAllPersonRequest openAccAllPersonRequest) { - String url = "/account/v2/person-open-account-four-element"; - HttpHeaders headers = new HttpHeaders(); - headers.addHeader(API_VERSION, V_1); - HttpResponse httpResponse = apiClient.post(url, headers, openAccAllPersonRequest.toJsonRequest(), OpenAccAllPersonResponse.class); - return httpResponse.getServiceResponse(); - } - /** * 企业账户开户 * @@ -119,20 +89,6 @@ public class AccountService { return httpResponse.getServiceResponse(); } - /** - * 开立客户全部电子登记簿账户（主账户和从账户）企业 - * - * @param openAccAllCompanyRequest OpenAccAllCompanyRequest - * @return OpenAccAllCompanyResponse - */ - public OpenAccAllCompanyResponse openAccAllCompany(OpenAccAllCompanyRequest openAccAllCompanyRequest) { - String url = "/account/v2/company-open-account"; - HttpHeaders headers = new HttpHeaders(); - headers.addHeader(API_VERSION, V_1); - HttpResponse httpResponse = apiClient.post(url, headers, openAccAllCompanyRequest.toJsonRequest(), OpenAccAllCompanyResponse.class); - return httpResponse.getServiceResponse(); - } - /** * 开立客户全部电子登记簿账户（主账户和从账户）企业 * @@ -220,42 +176,42 @@ public class AccountService { /** * 个人银行卡绑定 * - * @param addPrimAccPersonRequest AddPrimAccRequest - * @return AddPrimAccResponse + * @param personBindRequest PersonBindRequest + * @return PersonBindResponse */ - public AddPrimAccPersonResponse addPrimAccPerson(AddPrimAccPersonRequest addPrimAccPersonRequest) { + public PersonBindResponse personBind(PersonBindRequest personBindRequest) { 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); + HttpResponse httpResponse = apiClient.post(url, headers, personBindRequest.toJsonRequest(), PersonBindResponse.class); return httpResponse.getServiceResponse(); } /** * 企业银行账户绑定 * - * @param addPrimAccCompanyRequest AddPrimAccPersonRequest - * @return AddPrimAccPersonResponse + * @param companyBindRequest CompanyBindRequest + * @return CompanyBindResponse */ - public AddPrimAccCompanyResponse addPrimAccCompany(AddPrimAccCompanyRequest addPrimAccCompanyRequest) { + public CompanyBindResponse companyBind(CompanyBindRequest companyBindRequest) { 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); + HttpResponse httpResponse = apiClient.post(url, headers, companyBindRequest.toJsonRequest(), CompanyBindResponse.class); return httpResponse.getServiceResponse(); } /** * 绑定账卡号查询 * - * @param inqPrimAccRequest InqPrimAccRequest - * @return InqPrimAccResponse + * @param bankCardQueryRequest BankCardQueryRequest + * @return BankCardQueryResponse */ - public InqPrimAccResponse inqPrimAcc(InqPrimAccRequest inqPrimAccRequest) { + public BankCardQueryResponse bankCardQuery(BankCardQueryRequest bankCardQueryRequest) { 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); + HttpResponse httpResponse = apiClient.post(url, headers, bankCardQueryRequest.toJsonRequest(), BankCardQueryResponse.class); return httpResponse.getServiceResponse(); } @@ -265,6 +221,7 @@ public class AccountService { * @param setPrimAccRequest SetPrimAccRequest * @return SetPrimAccResponse */ + @Deprecated public SetPrimAccResponse setPrimAcc(SetPrimAccRequest setPrimAccRequest) { String url = "/accInfo/setPrimAcc"; HttpHeaders headers = new HttpHeaders(); @@ -276,14 +233,14 @@ public class AccountService { /** * 银行账卡号解绑 * - * @param delPrimAccRequest DelPrimAccRequest + * @param unbindRequest DelPrimAccRequest * @return DelPrimAccResponse */ - public DelPrimAccResponse delPrimAcc(DelPrimAccRequest delPrimAccRequest) { + public DelPrimAccResponse unbind(UnbindRequest unbindRequest) { 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); + HttpResponse httpResponse = apiClient.post(url, headers, unbindRequest.toJsonRequest(), DelPrimAccResponse.class); return httpResponse.getServiceResponse(); } @@ -305,7 +262,7 @@ public class AccountService { * 开户（内部户） * * @param openAccInnerRequest OpenAccInnerRequest - * @return EntpayagrtDelResponse + * @return OpenAccInnerResponse */ public OpenAccInnerResponse openAccInner(OpenAccInnerRequest openAccInnerRequest) { String url = "/account/v2/inner-open-account"; 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/BankCardQueryRequest.java similarity index 94% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/InqPrimAccRequest.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/BankCardQueryRequest.java index 3d06726..299a0e5 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/BankCardQueryRequest.java @@ -15,7 +15,7 @@ import lombok.experimental.Accessors; @Data @Accessors(chain = true) @TransType("223306") -public class InqPrimAccRequest implements ApiRequest { +public class BankCardQueryRequest implements ApiRequest { /** * 渠道编号 */ diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/InqPrimAccResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/BankCardQueryResponse.java similarity index 97% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/InqPrimAccResponse.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/BankCardQueryResponse.java index 494db16..05641a4 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/InqPrimAccResponse.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/BankCardQueryResponse.java @@ -17,7 +17,7 @@ import java.util.List; */ @Data @Accessors(chain = true) -public class InqPrimAccResponse implements ApiResponse { +public class BankCardQueryResponse implements ApiResponse { /** * 000000：表示成功 */ 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/CompanyBindRequest.java similarity index 97% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/AddPrimAccCompanyRequest.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/CompanyBindRequest.java index 5c09d02..810dde6 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/CompanyBindRequest.java @@ -15,7 +15,7 @@ import lombok.experimental.Accessors; @Data @Accessors(chain = true) @TransType("223304") -public class AddPrimAccCompanyRequest implements ApiRequest { +public class CompanyBindRequest implements ApiRequest { /** * 渠道编号 */ diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/AddPrimAccCompanyResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/CompanyBindResponse.java similarity index 92% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/AddPrimAccCompanyResponse.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/CompanyBindResponse.java index 85bfad6..ad520be 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/AddPrimAccCompanyResponse.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/CompanyBindResponse.java @@ -13,7 +13,7 @@ import lombok.experimental.Accessors; */ @Data @Accessors(chain = true) -public class AddPrimAccCompanyResponse implements ApiResponse { +public class CompanyBindResponse implements ApiResponse { /** * 000000：表示成功 */ 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/PersonBindRequest.java similarity index 97% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/AddPrimAccPersonRequest.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/PersonBindRequest.java index 9c0b393..148704b 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/PersonBindRequest.java @@ -15,7 +15,7 @@ import lombok.experimental.Accessors; @Data @Accessors(chain = true) @TransType("223303") -public class AddPrimAccPersonRequest implements ApiRequest { +public class PersonBindRequest implements ApiRequest { /** * 渠道编号 */ diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/AddPrimAccPersonResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/PersonBindResponse.java similarity index 92% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/AddPrimAccPersonResponse.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/PersonBindResponse.java index 66ac8f0..4756bc2 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/AddPrimAccPersonResponse.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/PersonBindResponse.java @@ -13,7 +13,7 @@ import lombok.experimental.Accessors; */ @Data @Accessors(chain = true) -public class AddPrimAccPersonResponse implements ApiResponse { +public class PersonBindResponse implements ApiResponse { /** * 000000：表示成功 */ 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/UnbindRequest.java similarity index 95% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/DelPrimAccRequest.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/UnbindRequest.java index 0abc4c4..d08ddb9 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/UnbindRequest.java @@ -15,7 +15,7 @@ import lombok.experimental.Accessors; @Data @Accessors(chain = true) @TransType("223305") -public class DelPrimAccRequest implements ApiRequest { +public class UnbindRequest 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 60fd935..74f4f65 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 @@ -32,14 +32,14 @@ public class BillService { /** * 回单下载 * - * @param returnBillRequest ReturnBillRequest - * @return ReturnBillResponse + * @param tradeVoucherDownloadRequest TradeVoucherDownloadRequest + * @return TradeVoucherDownloadResponse */ - public ReturnBillResponse returnBill(ReturnBillRequest returnBillRequest) { + public TradeVoucherDownloadResponse tradeVoucherDownload(TradeVoucherDownloadRequest tradeVoucherDownloadRequest) { 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); + HttpResponse httpResponse = apiClient.post(url, headers, tradeVoucherDownloadRequest.toJsonRequest(), TradeVoucherDownloadResponse.class); return httpResponse.getServiceResponse(); } @@ -60,28 +60,28 @@ public class BillService { /** * 对账单下载 * - * @param checkBillRequest CheckBillRequest - * @return CheckBillResponse + * @param checkVoucherDownloadRequest CheckVoucherDownloadRequest + * @return CheckVoucherDownloadResponse */ - public CheckBillResponse checkBill(CheckBillRequest checkBillRequest) { + public CheckVoucherDownloadResponse checkVoucherDownload(CheckVoucherDownloadRequest checkVoucherDownloadRequest) { 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); + HttpResponse httpResponse = apiClient.post(url, headers, checkVoucherDownloadRequest.toJsonRequest(), CheckVoucherDownloadResponse.class); return httpResponse.getServiceResponse(); } /** * 余额回单下载 * - * @param balanceBillRequest BalanceBillRequest - * @return BalanceBillResponse + * @param balanceBalanceVoucherRequest BalanceBalanceVoucherRequest + * @return BalanceBalanceVoucherResponse */ - public BalanceBillResponse balanceBill(BalanceBillRequest balanceBillRequest) { + public BalanceBalanceVoucherResponse balanceVoucherDownload(BalanceBalanceVoucherRequest balanceBalanceVoucherRequest) { 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); + HttpResponse httpResponse = apiClient.post(url, headers, balanceBalanceVoucherRequest.toJsonRequest(), BalanceBalanceVoucherResponse.class); return httpResponse.getServiceResponse(); } } 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/BalanceBalanceVoucherRequest.java similarity index 94% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bills/model/BalanceBillRequest.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bills/model/BalanceBalanceVoucherRequest.java index c7e89d9..f29116a 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/BalanceBalanceVoucherRequest.java @@ -13,7 +13,7 @@ import lombok.experimental.Accessors; @Data @Accessors(chain = true) @TransType("223212") -public class BalanceBillRequest implements ApiRequest { +public class BalanceBalanceVoucherRequest implements ApiRequest { /** * 渠道编号 */ diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bills/model/BalanceBillResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bills/model/BalanceBalanceVoucherResponse.java similarity index 96% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bills/model/BalanceBillResponse.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bills/model/BalanceBalanceVoucherResponse.java index 3dcead6..32f02d6 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bills/model/BalanceBillResponse.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bills/model/BalanceBalanceVoucherResponse.java @@ -13,7 +13,7 @@ import java.math.BigDecimal; */ @Data @Accessors(chain = true) -public class BalanceBillResponse implements ApiResponse { +public class BalanceBalanceVoucherResponse implements ApiResponse { /** * 000000：表示成功 */ 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/CheckVoucherDownloadRequest.java similarity index 94% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bills/model/CheckBillRequest.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bills/model/CheckVoucherDownloadRequest.java index c391f94..95d70e3 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/CheckVoucherDownloadRequest.java @@ -9,7 +9,7 @@ import lombok.experimental.Accessors; @Data @Accessors(chain = true) @TransType("231312") -public class CheckBillRequest implements ApiRequest { +public class CheckVoucherDownloadRequest implements ApiRequest { /** * 渠道编号 */ diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bills/model/CheckBillResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bills/model/CheckVoucherDownloadResponse.java similarity index 92% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bills/model/CheckBillResponse.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bills/model/CheckVoucherDownloadResponse.java index 3acf525..cd9a7ef 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bills/model/CheckBillResponse.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bills/model/CheckVoucherDownloadResponse.java @@ -7,7 +7,7 @@ import lombok.experimental.Accessors; @Data @Accessors(chain = true) -public class CheckBillResponse implements ApiResponse { +public class CheckVoucherDownloadResponse implements ApiResponse { /** * 000000：表示成功 */ 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/TradeVoucherDownloadRequest.java similarity index 94% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bills/model/ReturnBillRequest.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bills/model/TradeVoucherDownloadRequest.java index b2d1af9..e4bdd49 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/TradeVoucherDownloadRequest.java @@ -12,7 +12,7 @@ import lombok.experimental.Accessors; @Data @Accessors(chain = true) @TransType("231311") -public class ReturnBillRequest implements ApiRequest { +public class TradeVoucherDownloadRequest implements ApiRequest { /** * 渠道编号 */ diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bills/model/ReturnBillResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bills/model/TradeVoucherDownloadResponse.java similarity index 95% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bills/model/ReturnBillResponse.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bills/model/TradeVoucherDownloadResponse.java index 59646fe..9c1577b 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bills/model/ReturnBillResponse.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bills/model/TradeVoucherDownloadResponse.java @@ -10,7 +10,7 @@ import java.util.List; @Data @Accessors(chain = true) -public class ReturnBillResponse implements ApiResponse { +public class TradeVoucherDownloadResponse implements ApiResponse { /** * 000000：表示成功 */ 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 c160e03..464d794 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 @@ -50,56 +50,56 @@ public class BmdService { /** * 白名单列表查询 * - * @param bmdListRequest BmdListRequest + * @param bmdQueryRequest BmdListRequest * @return BmdListResponse */ - public BmdListResponse bmdList(BmdListRequest bmdListRequest) { + public BmdQueryResponse bmdQuery(BmdQueryRequest bmdQueryRequest) { 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); + HttpResponse httpResponse = apiClient.post(url, headers, bmdQueryRequest.toJsonRequest(), BmdQueryResponse.class); return httpResponse.getServiceResponse(); } /** * 融资白名单新增 * - * @param applyBmdAddRequest ApplyBmdAddRequest + * @param loanBmdAddRequest LoanBmdAddRequest * @return ApplyBmdAddResponse */ - public ApplyBmdAddResponse applyBmdAdd(ApplyBmdAddRequest applyBmdAddRequest) { + public LoanBmdAddResponse loanBmdAdd(LoanBmdAddRequest loanBmdAddRequest) { String url = "/loan-white-list/v2/add"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); - HttpResponse httpResponse = apiClient.post(url, headers, applyBmdAddRequest.toJsonRequest(), ApplyBmdAddResponse.class); + HttpResponse httpResponse = apiClient.post(url, headers, loanBmdAddRequest.toJsonRequest(), LoanBmdAddResponse.class); return httpResponse.getServiceResponse(); } /** * 融资白名单删除 * - * @param applyBmdDelRequest ApplyBmdDelRequest + * @param loanBmdDelRequest ApplyBmdDelRequest * @return ApplyBmdAddResponse */ - public ApplyBmdDelResponse applyBmdDel(ApplyBmdDelRequest applyBmdDelRequest) { + public LoanBmdDelResponse loanBmdDel(LoanBmdDelRequest loanBmdDelRequest) { String url = "/loan-white-list/v2/del"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); - HttpResponse httpResponse = apiClient.post(url, headers, applyBmdDelRequest.toJsonRequest(), ApplyBmdDelResponse.class); + HttpResponse httpResponse = apiClient.post(url, headers, loanBmdDelRequest.toJsonRequest(), LoanBmdDelResponse.class); return httpResponse.getServiceResponse(); } /** * 融资白名单查询 * - * @param applyBmdQueryRequest ApplyBmdQueryRequest - * @return ApplyBmdQueryResponse + * @param loanBmdQueryRequest LoanBmdQueryRequest + * @return LoanBmdQueryResponse */ - public ApplyBmdQueryResponse applyBmdQuery(ApplyBmdQueryRequest applyBmdQueryRequest) { + public LoanBmdQueryResponse loanBmdQuery(LoanBmdQueryRequest loanBmdQueryRequest) { String url = "/loan-white-list/v2/query"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); - HttpResponse httpResponse = apiClient.post(url, headers, applyBmdQueryRequest.toJsonRequest(), ApplyBmdQueryResponse.class); + HttpResponse httpResponse = apiClient.post(url, headers, loanBmdQueryRequest.toJsonRequest(), LoanBmdQueryResponse.class); return httpResponse.getServiceResponse(); } } 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/BmdQueryRequest.java similarity index 94% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/BmdListRequest.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/BmdQueryRequest.java index d25db26..e37adb4 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/BmdQueryRequest.java @@ -13,7 +13,7 @@ import lombok.experimental.Accessors; @Data @Accessors(chain = true) @TransType("231405") -public class BmdListRequest implements ApiRequest { +public class BmdQueryRequest implements ApiRequest { /** * 渠道编号 */ diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/BmdListResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/BmdQueryResponse.java similarity index 96% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/BmdListResponse.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/BmdQueryResponse.java index d8b110f..747926d 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/BmdListResponse.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/BmdQueryResponse.java @@ -14,7 +14,7 @@ import java.util.List; */ @Data @Accessors(chain = true) -public class BmdListResponse implements ApiResponse { +public class BmdQueryResponse implements ApiResponse { /** * 000000：表示成功 */ diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/ApplyBmdAddRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/LoanBmdAddRequest.java similarity index 97% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/ApplyBmdAddRequest.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/LoanBmdAddRequest.java index e828b54..3d9355b 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/ApplyBmdAddRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/LoanBmdAddRequest.java @@ -15,7 +15,7 @@ import java.math.BigDecimal; @Data @Accessors(chain = true) @TransType("242305") -public class ApplyBmdAddRequest implements ApiRequest { +public class LoanBmdAddRequest implements ApiRequest { /** * 渠道编号 */ diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/ApplyBmdAddResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/LoanBmdAddResponse.java similarity index 92% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/ApplyBmdAddResponse.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/LoanBmdAddResponse.java index dcdbfd3..ba13c1b 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/ApplyBmdAddResponse.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/LoanBmdAddResponse.java @@ -11,7 +11,7 @@ import lombok.experimental.Accessors; */ @Data @Accessors(chain = true) -public class ApplyBmdAddResponse implements ApiResponse { +public class LoanBmdAddResponse implements ApiResponse { /** * 000000：表示成功 */ diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/ApplyBmdDelRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/LoanBmdDelRequest.java similarity index 94% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/ApplyBmdDelRequest.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/LoanBmdDelRequest.java index 9215f6f..80a0d19 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/ApplyBmdDelRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/LoanBmdDelRequest.java @@ -15,7 +15,7 @@ import lombok.experimental.Accessors; @Data @Accessors(chain = true) @TransType("242306") -public class ApplyBmdDelRequest implements ApiRequest { +public class LoanBmdDelRequest implements ApiRequest { /** * 渠道编号 */ diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/ApplyBmdDelResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/LoanBmdDelResponse.java similarity index 92% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/ApplyBmdDelResponse.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/LoanBmdDelResponse.java index ea85548..cd84a7a 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/ApplyBmdDelResponse.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/LoanBmdDelResponse.java @@ -13,7 +13,7 @@ import lombok.experimental.Accessors; */ @Data @Accessors(chain = true) -public class ApplyBmdDelResponse implements ApiResponse { +public class LoanBmdDelResponse implements ApiResponse { /** * 000000：表示成功 */ diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/ApplyBmdQueryRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/LoanBmdQueryRequest.java similarity index 94% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/ApplyBmdQueryRequest.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/LoanBmdQueryRequest.java index c767563..edd1fd2 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/ApplyBmdQueryRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/LoanBmdQueryRequest.java @@ -15,7 +15,7 @@ import lombok.experimental.Accessors; @Data @Accessors(chain = true) @TransType("242307") -public class ApplyBmdQueryRequest implements ApiRequest { +public class LoanBmdQueryRequest implements ApiRequest { /** * 渠道编号 */ diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/ApplyBmdQueryResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/LoanBmdQueryResponse.java similarity index 98% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/ApplyBmdQueryResponse.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/LoanBmdQueryResponse.java index 32c11e1..74ecbd9 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/ApplyBmdQueryResponse.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/LoanBmdQueryResponse.java @@ -17,7 +17,7 @@ import java.util.List; */ @Data @Accessors(chain = true) -public class ApplyBmdQueryResponse implements ApiResponse { +public class LoanBmdQueryResponse implements ApiResponse { /** * 000000：表示成功 */ 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 0f56844..c62fd66 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 @@ -19,20 +19,6 @@ public class LoanService { this.apiClient = apiClient; } - /** - * 贷款申请 - * - * @param applyPersonRequest ApplyPersonRequest - * @return ApplyPersonResponse - */ - public ApplyPersonResponse applyPerson(ApplyPersonRequest applyPersonRequest) { - String url = "/loanapi/apply"; - HttpHeaders headers = new HttpHeaders(); - headers.addHeader(API_VERSION, V_1); - HttpResponse httpResponse = apiClient.post(url, headers, applyPersonRequest.toJsonRequest(), ApplyPersonResponse.class); - return httpResponse.getServiceResponse(); - } - /** * 企业贷款申请 * @@ -40,13 +26,27 @@ public class LoanService { * @return ApplyCompanyResponse */ public ApplyCompanyResponse applyCompany(ApplyCompanyRequest applyCompanyRequest) { - String url = "/loan/v2/company-apply"; + String url = "/loan/v2/apply-company"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); HttpResponse httpResponse = apiClient.post(url, headers, applyCompanyRequest.toJsonRequest(), ApplyCompanyResponse.class); return httpResponse.getServiceResponse(); } + /** + * 贷款申请 + * + * @param applyPersonRequest ApplyPersonRequest + * @return ApplyPersonResponse + */ + public ApplyPersonResponse applyPerson(ApplyPersonRequest applyPersonRequest) { + String url = "/loan/v2/apply-person"; + HttpHeaders headers = new HttpHeaders(); + headers.addHeader(API_VERSION, V_1); + HttpResponse httpResponse = apiClient.post(url, headers, applyPersonRequest.toJsonRequest(), ApplyPersonResponse.class); + return httpResponse.getServiceResponse(); + } + /** * 贷款申请进度查询 * @@ -78,14 +78,14 @@ public class LoanService { /** * 贷款还款信息查询 * - * @param applyQueryV2Request ApplyQueryV2Request - * @return ApplyQueryV2Response + * @param loanRepayQueryRequest LoanRepayQueryRequest + * @return LoanRepayQueryResponse */ - public ApplyQueryV2Response repayQueryV2(ApplyQueryV2Request applyQueryV2Request) { + public LoanRepayQueryResponse loanRepayQuery(LoanRepayQueryRequest loanRepayQueryRequest) { 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); + HttpResponse httpResponse = apiClient.post(url, headers, loanRepayQueryRequest.toJsonRequest(), LoanRepayQueryResponse.class); return httpResponse.getServiceResponse(); } 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/LoanRepayQueryRequest.java similarity index 96% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/loan/model/ApplyQueryV2Request.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/loan/model/LoanRepayQueryRequest.java index 4370f93..9ddab79 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/LoanRepayQueryRequest.java @@ -17,7 +17,7 @@ import java.math.BigDecimal; @Data @Accessors(chain = true) @TransType("243203") -public class ApplyQueryV2Request implements ApiRequest { +public class LoanRepayQueryRequest implements ApiRequest { /** * 渠道编号 */ diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/loan/model/ApplyQueryV2Response.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/loan/model/LoanRepayQueryResponse.java similarity index 98% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/loan/model/ApplyQueryV2Response.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/loan/model/LoanRepayQueryResponse.java index 2e3b410..4e4494f 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/loan/model/ApplyQueryV2Response.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/loan/model/LoanRepayQueryResponse.java @@ -17,7 +17,7 @@ import java.util.List; */ @Data @Accessors(chain = true) -public class ApplyQueryV2Response implements ApiResponse { +public class LoanRepayQueryResponse implements ApiResponse { /** * 000000：表示成功 */ 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 fbc3cc7..96a8b41 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 @@ -36,14 +36,14 @@ public class PayService { /** * 提现（平台专用） * - * @param merWithdrawV2Request MerWithdrawV2Request - * @return MerWithdrawV2Response + * @param merWithdrawForPlatformRequest MerWithdrawForPlatformRequest + * @return MerWithdrawForPlatformResponse */ - public MerWithdrawV2Response merWithdrawV2(MerWithdrawV2Request merWithdrawV2Request) { + public MerWithdrawForPlatformResponse withdrawForPlatform(MerWithdrawForPlatformRequest merWithdrawForPlatformRequest) { 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); + HttpResponse httpResponse = apiClient.post(url, headers, merWithdrawForPlatformRequest.toJsonRequest(), MerWithdrawForPlatformResponse.class); return httpResponse.getServiceResponse(); } 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/MerWithdrawForPlatformRequest.java similarity index 96% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/MerWithdrawV2Request.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/MerWithdrawForPlatformRequest.java index 0a11d29..38a8c58 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/MerWithdrawForPlatformRequest.java @@ -15,7 +15,7 @@ import java.math.BigDecimal; @Data @Accessors(chain = true) @TransType("231103") -public class MerWithdrawV2Request implements ApiRequest { +public class MerWithdrawForPlatformRequest implements ApiRequest { /** * 渠道编号 */ diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/MerWithdrawV2Response.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/MerWithdrawForPlatformResponse.java similarity index 95% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/MerWithdrawV2Response.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/MerWithdrawForPlatformResponse.java index 8fd4825..9589ac7 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/MerWithdrawV2Response.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/MerWithdrawForPlatformResponse.java @@ -13,7 +13,7 @@ import java.math.BigDecimal; */ @Data @Accessors(chain = true) -public class MerWithdrawV2Response implements ApiResponse { +public class MerWithdrawForPlatformResponse implements ApiResponse { /** * 000000：表示成功 */ diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/trans/TransService.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/trans/TransService.java index e7ff317..f253d93 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/trans/TransService.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/trans/TransService.java @@ -50,27 +50,28 @@ public class TransService { /** * 查询账户交易明细 * - * @param queryTradeListNewRequest QueryTradeListNewRequest - * @return QueryTradeListNewResponse + * @param queryTradeDetailsRequest QueryTradeDetailsRequest + * @return QueryTradeDetailsResponse */ - public QueryTradeListNewResponse queryTradeListNew(QueryTradeListNewRequest queryTradeListNewRequest) { + public QueryTradeDetailsResponse queryTradeDetails(QueryTradeDetailsRequest queryTradeDetailsRequest) { String url = "/trade-details/v2/query"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); - HttpResponse httpResponse = apiClient.post(url, headers, queryTradeListNewRequest.toJsonRequest(), QueryTradeListNewResponse.class); + HttpResponse httpResponse = apiClient.post(url, headers, queryTradeDetailsRequest.toJsonRequest(), QueryTradeDetailsResponse.class); return httpResponse.getServiceResponse(); } + /** * 历史交易明细查询接口 * - * @param queryHistoryRequest QueryHistoryRequest + * @param queryTradeDetailsHistoryRequest QueryHistoryRequest * @return QueryHistoryResponse */ - public QueryHistoryResponse queryHistory(QueryHistoryRequest queryHistoryRequest) { + public QueryTradeDetailsHistoryResponse queryHistory(QueryTradeDetailsHistoryRequest queryTradeDetailsHistoryRequest) { String url = "/trade-details/v2/query-history"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); - HttpResponse httpResponse = apiClient.post(url, headers, queryHistoryRequest.toJsonRequest(), QueryHistoryResponse.class); + HttpResponse httpResponse = apiClient.post(url, headers, queryTradeDetailsHistoryRequest.toJsonRequest(), QueryTradeDetailsHistoryResponse.class); return httpResponse.getServiceResponse(); } } diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/trans/model/QueryHistoryRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/trans/model/QueryTradeDetailsHistoryRequest.java similarity index 93% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/trans/model/QueryHistoryRequest.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/trans/model/QueryTradeDetailsHistoryRequest.java index 4a41618..2e8fde9 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/trans/model/QueryHistoryRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/trans/model/QueryTradeDetailsHistoryRequest.java @@ -15,7 +15,7 @@ import lombok.experimental.Accessors; @Data @Accessors(chain = true) @TransType("230304") -public class QueryHistoryRequest implements ApiRequest { +public class QueryTradeDetailsHistoryRequest implements ApiRequest { /** * 渠道编号 */ @@ -40,7 +40,7 @@ public class QueryHistoryRequest implements ApiRequest { * 操作时间yyyy-MM-dd hh:mm:ss */ @SerializedName("trans_tradetime") - private String transTradetime; + private String transTradeTime; /** * 账号 */ diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/trans/model/QueryHistoryResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/trans/model/QueryTradeDetailsHistoryResponse.java similarity index 97% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/trans/model/QueryHistoryResponse.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/trans/model/QueryTradeDetailsHistoryResponse.java index dcf9c46..0368ece 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/trans/model/QueryHistoryResponse.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/trans/model/QueryTradeDetailsHistoryResponse.java @@ -14,7 +14,7 @@ import java.util.List; */ @Data @Accessors(chain = true) -public class QueryHistoryResponse { +public class QueryTradeDetailsHistoryResponse { /** * 返回码 000000：表示成功，才有基础要素输出 */ @@ -95,8 +95,8 @@ public class QueryHistoryResponse { @Accessors(chain = true) public static class DetailList implements Serializable { /** - * 内码ID，可用来排序 - */ + * 内码ID，可用来排序 + */ @SerializedName("id") private Integer id; /** diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/trans/model/QueryTradeListNewRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/trans/model/QueryTradeDetailsRequest.java similarity index 95% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/trans/model/QueryTradeListNewRequest.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/trans/model/QueryTradeDetailsRequest.java index 7d9f379..38bb743 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/trans/model/QueryTradeListNewRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/trans/model/QueryTradeDetailsRequest.java @@ -13,7 +13,7 @@ import lombok.experimental.Accessors; @Data @Accessors(chain = true) @TransType("230303") -public class QueryTradeListNewRequest implements ApiRequest { +public class QueryTradeDetailsRequest implements ApiRequest { /** * 渠道编号 */ diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/trans/model/QueryTradeListNewResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/trans/model/QueryTradeDetailsResponse.java similarity index 98% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/trans/model/QueryTradeListNewResponse.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/trans/model/QueryTradeDetailsResponse.java index f139c0e..a0453e2 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/trans/model/QueryTradeListNewResponse.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/trans/model/QueryTradeDetailsResponse.java @@ -15,7 +15,7 @@ import java.util.List; */ @Data @Accessors(chain = true) -public class QueryTradeListNewResponse implements ApiResponse { +public class QueryTradeDetailsResponse implements ApiResponse { /** * 000000：表示成功 */ diff --git a/scfs-api-test/src/test/java/com/czcb/scfs/api/test/ApiGatewayTest.java b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/ApiGatewayTest.java index dae991b..e737e33 100644 --- a/scfs-api-test/src/test/java/com/czcb/scfs/api/test/ApiGatewayTest.java +++ b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/ApiGatewayTest.java @@ -4,14 +4,14 @@ import com.czcb.scfs.api.core.util.Compression; import com.czcb.scfs.api.core.util.Nonce; import com.czcb.scfs.api.core.util.PemFile; import com.czcb.scfs.api.service.echo.EchoService; -import com.czcb.scfs.api.service.v1.account.AccountService; -import com.czcb.scfs.api.service.v1.account.model.QueryBalanceRequest; -import com.czcb.scfs.api.service.v1.account.model.QueryBalanceResponse; -import com.czcb.scfs.api.service.v1.file.FileService; -import com.czcb.scfs.api.service.v1.file.model.UploadFileRequest; -import com.czcb.scfs.api.service.v1.file.model.UploadFileResponse; -import com.czcb.scfs.api.service.v1.sms.SmsService; -import com.czcb.scfs.api.service.v1.sms.model.SendVerifySignRequest; +import com.czcb.scfs.api.service.v2.account.AccountService; +import com.czcb.scfs.api.service.v2.account.model.QueryBalanceRequest; +import com.czcb.scfs.api.service.v2.account.model.QueryBalanceResponse; +import com.czcb.scfs.api.service.v2.file.FileService; +import com.czcb.scfs.api.service.v2.file.model.UploadFileRequest; +import com.czcb.scfs.api.service.v2.file.model.UploadFileResponse; +import com.czcb.scfs.api.service.v2.sms.SmsService; +import com.czcb.scfs.api.service.v2.sms.model.SendVerifySignRequest; import com.tencent.kona.KonaProvider; import org.assertj.core.util.Lists; import org.junit.jupiter.api.Test;