ref: v2 model

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<ApplyPersonResponse> 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<ApplyCompanyResponse> 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<ApplyQueryResponse> httpResponse = apiClient.post(url, headers, applyQueryRequest.toJsonRequest(), ApplyQueryResponse.class);

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<CreateAccountResponse> 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<OpenAccAllPersonResponse> 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<OpenAccAllCompanyResponse> httpResponse = apiClient.post(url, headers, openAccAllCompanyRequest.toJsonRequest(), OpenAccAllCompanyResponse.class);
-        return httpResponse.getServiceResponse();
-    }
-
     /**
      * 开立客户全部电子登记簿账户（主账户和从账户）企业
      *
@@ -220,42 +176,42 @@ public class AccountService {
     /**
      * 个人银行卡绑定
      *
-     * @param addPrimAccPersonRequest AddPrimAccRequest
+     * @param personBindRequest PersonBindRequest
-     * @return AddPrimAccResponse
+     * @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<AddPrimAccPersonResponse> httpResponse = apiClient.post(url, headers, addPrimAccPersonRequest.toJsonRequest(), AddPrimAccPersonResponse.class);
+        HttpResponse<PersonBindResponse> httpResponse = apiClient.post(url, headers, personBindRequest.toJsonRequest(), PersonBindResponse.class);
         return httpResponse.getServiceResponse();
     }
 
     /**
      * 企业银行账户绑定
      *
-     * @param addPrimAccCompanyRequest AddPrimAccPersonRequest
+     * @param companyBindRequest CompanyBindRequest
-     * @return AddPrimAccPersonResponse
+     * @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<AddPrimAccCompanyResponse> httpResponse = apiClient.post(url, headers, addPrimAccCompanyRequest.toJsonRequest(), AddPrimAccCompanyResponse.class);
+        HttpResponse<CompanyBindResponse> httpResponse = apiClient.post(url, headers, companyBindRequest.toJsonRequest(), CompanyBindResponse.class);
         return httpResponse.getServiceResponse();
     }
 
     /**
      * 绑定账卡号查询
      *
-     * @param inqPrimAccRequest InqPrimAccRequest
+     * @param bankCardQueryRequest BankCardQueryRequest
-     * @return InqPrimAccResponse
+     * @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<InqPrimAccResponse> httpResponse = apiClient.post(url, headers, inqPrimAccRequest.toJsonRequest(), InqPrimAccResponse.class);
+        HttpResponse<BankCardQueryResponse> 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<DelPrimAccResponse> httpResponse = apiClient.post(url, headers, delPrimAccRequest.toJsonRequest(), DelPrimAccResponse.class);
+        HttpResponse<DelPrimAccResponse> 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";

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 {
     /**
      * 渠道编号
      */

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：表示成功
      */

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 {
     /**
      * 渠道编号
      */

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：表示成功
      */

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 {
     /**
      * 渠道编号
      */

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：表示成功
      */

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 {
     /**
      * 渠道编号
      */

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
+     * @param tradeVoucherDownloadRequest TradeVoucherDownloadRequest
-     * @return ReturnBillResponse
+     * @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<ReturnBillResponse> httpResponse = apiClient.post(url, headers, returnBillRequest.toJsonRequest(), ReturnBillResponse.class);
+        HttpResponse<TradeVoucherDownloadResponse> httpResponse = apiClient.post(url, headers, tradeVoucherDownloadRequest.toJsonRequest(), TradeVoucherDownloadResponse.class);
         return httpResponse.getServiceResponse();
     }
 
@@ -60,28 +60,28 @@ public class BillService {
     /**
      * 对账单下载
      *
-     * @param checkBillRequest CheckBillRequest
+     * @param checkVoucherDownloadRequest CheckVoucherDownloadRequest
-     * @return CheckBillResponse
+     * @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<CheckBillResponse> httpResponse = apiClient.post(url, headers, checkBillRequest.toJsonRequest(), CheckBillResponse.class);
+        HttpResponse<CheckVoucherDownloadResponse> httpResponse = apiClient.post(url, headers, checkVoucherDownloadRequest.toJsonRequest(), CheckVoucherDownloadResponse.class);
         return httpResponse.getServiceResponse();
     }
 
     /**
      * 余额回单下载
      *
-     * @param balanceBillRequest BalanceBillRequest
+     * @param balanceBalanceVoucherRequest BalanceBalanceVoucherRequest
-     * @return BalanceBillResponse
+     * @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<BalanceBillResponse> httpResponse = apiClient.post(url, headers, balanceBillRequest.toJsonRequest(), BalanceBillResponse.class);
+        HttpResponse<BalanceBalanceVoucherResponse> httpResponse = apiClient.post(url, headers, balanceBalanceVoucherRequest.toJsonRequest(), BalanceBalanceVoucherResponse.class);
         return httpResponse.getServiceResponse();
     }
 }

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 {
     /**
      * 渠道编号
      */

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：表示成功
      */

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 {
     /**
      * 渠道编号
      */

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：表示成功
      */

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 {
     /**
      * 渠道编号
      */

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：表示成功
      */

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<BmdListResponse> httpResponse = apiClient.post(url, headers, bmdListRequest.toJsonRequest(), BmdListResponse.class);
+        HttpResponse<BmdQueryResponse> 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<ApplyBmdAddResponse> httpResponse = apiClient.post(url, headers, applyBmdAddRequest.toJsonRequest(), ApplyBmdAddResponse.class);
+        HttpResponse<LoanBmdAddResponse> 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<ApplyBmdDelResponse> httpResponse = apiClient.post(url, headers, applyBmdDelRequest.toJsonRequest(), ApplyBmdDelResponse.class);
+        HttpResponse<LoanBmdDelResponse> httpResponse = apiClient.post(url, headers, loanBmdDelRequest.toJsonRequest(), LoanBmdDelResponse.class);
         return httpResponse.getServiceResponse();
     }
 
     /**
      * 融资白名单查询
      *
-     * @param applyBmdQueryRequest ApplyBmdQueryRequest
+     * @param loanBmdQueryRequest LoanBmdQueryRequest
-     * @return ApplyBmdQueryResponse
+     * @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<ApplyBmdQueryResponse> httpResponse = apiClient.post(url, headers, applyBmdQueryRequest.toJsonRequest(), ApplyBmdQueryResponse.class);
+        HttpResponse<LoanBmdQueryResponse> httpResponse = apiClient.post(url, headers, loanBmdQueryRequest.toJsonRequest(), LoanBmdQueryResponse.class);
         return httpResponse.getServiceResponse();
     }
 }

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 {
     /**
      * 渠道编号
      */

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：表示成功
      */

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 {
     /**
      * 渠道编号
      */

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：表示成功
      */

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 {
     /**
      * 渠道编号
      */

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：表示成功
      */

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 {
     /**
      * 渠道编号
      */

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：表示成功
      */

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<ApplyPersonResponse> 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<ApplyCompanyResponse> 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<ApplyPersonResponse> httpResponse = apiClient.post(url, headers, applyPersonRequest.toJsonRequest(), ApplyPersonResponse.class);
+        return httpResponse.getServiceResponse();
+    }
+
     /**
      * 贷款申请进度查询
      *
@@ -78,14 +78,14 @@ public class LoanService {
     /**
      * 贷款还款信息查询
      *
-     * @param applyQueryV2Request ApplyQueryV2Request
+     * @param loanRepayQueryRequest LoanRepayQueryRequest
-     * @return ApplyQueryV2Response
+     * @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<ApplyQueryV2Response> httpResponse = apiClient.post(url, headers, applyQueryV2Request.toJsonRequest(), ApplyQueryV2Response.class);
+        HttpResponse<LoanRepayQueryResponse> httpResponse = apiClient.post(url, headers, loanRepayQueryRequest.toJsonRequest(), LoanRepayQueryResponse.class);
         return httpResponse.getServiceResponse();
     }
 

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 {
     /**
      * 渠道编号
      */

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：表示成功
      */

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
+     * @param merWithdrawForPlatformRequest MerWithdrawForPlatformRequest
-     * @return MerWithdrawV2Response
+     * @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<MerWithdrawV2Response> httpResponse = apiClient.post(url, headers, merWithdrawV2Request.toJsonRequest(), MerWithdrawV2Response.class);
+        HttpResponse<MerWithdrawForPlatformResponse> httpResponse = apiClient.post(url, headers, merWithdrawForPlatformRequest.toJsonRequest(), MerWithdrawForPlatformResponse.class);
         return httpResponse.getServiceResponse();
     }
 

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 {
     /**
      * 渠道编号
      */

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：表示成功
      */

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
+     * @param queryTradeDetailsRequest QueryTradeDetailsRequest
-     * @return QueryTradeListNewResponse
+     * @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<QueryTradeListNewResponse> httpResponse = apiClient.post(url, headers, queryTradeListNewRequest.toJsonRequest(), QueryTradeListNewResponse.class);
+        HttpResponse<QueryTradeDetailsResponse> 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<QueryHistoryResponse> httpResponse = apiClient.post(url, headers, queryHistoryRequest.toJsonRequest(), QueryHistoryResponse.class);
+        HttpResponse<QueryTradeDetailsHistoryResponse> httpResponse = apiClient.post(url, headers, queryTradeDetailsHistoryRequest.toJsonRequest(), QueryTradeDetailsHistoryResponse.class);
         return httpResponse.getServiceResponse();
     }
 }

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;
     /**
      * 账号
      */

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;
         /**

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 {
     /**
      * 渠道编号
      */

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：表示成功
      */

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.v2.account.AccountService;
-import com.czcb.scfs.api.service.v1.account.model.QueryBalanceRequest;
+import com.czcb.scfs.api.service.v2.account.model.QueryBalanceRequest;
-import com.czcb.scfs.api.service.v1.account.model.QueryBalanceResponse;
+import com.czcb.scfs.api.service.v2.account.model.QueryBalanceResponse;
-import com.czcb.scfs.api.service.v1.file.FileService;
+import com.czcb.scfs.api.service.v2.file.FileService;
-import com.czcb.scfs.api.service.v1.file.model.UploadFileRequest;
+import com.czcb.scfs.api.service.v2.file.model.UploadFileRequest;
-import com.czcb.scfs.api.service.v1.file.model.UploadFileResponse;
+import com.czcb.scfs.api.service.v2.file.model.UploadFileResponse;
-import com.czcb.scfs.api.service.v1.sms.SmsService;
+import com.czcb.scfs.api.service.v2.sms.SmsService;
-import com.czcb.scfs.api.service.v1.sms.model.SendVerifySignRequest;
+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;