Merge remote-tracking branch 'origin/dev' into dev

main
wb1608 2024-04-15 15:47:01 +08:00
commit d26da41a2e
31 changed files with 200 additions and 72 deletions

View File

@ -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<AddPrimAccPersonResponse> 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<AddPrimAccCompanyResponse> 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<InqPrimAccResponse> 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<DelPrimAccResponse> httpResponse = apiClient.post(url, headers, delPrimAccRequest.toJsonRequest(), DelPrimAccResponse.class);

View File

@ -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 {
/**
*

View File

@ -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 {
/**
*

View File

@ -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 {
/**
*

View File

@ -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 {
/**
*

View File

@ -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<ReturnBillResponse> 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<CheckBillV2Response> 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<CheckBillResponse> 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<BalanceBillResponse> httpResponse = apiClient.post(url, headers, balanceBillRequest.toJsonRequest(), BalanceBillResponse.class);

View File

@ -12,7 +12,7 @@ import lombok.experimental.Accessors;
*/
@Data
@Accessors(chain = true)
@TransType("100037")
@TransType("223212")
public class BalanceBillRequest implements ApiRequest {
/**
*

View File

@ -8,7 +8,7 @@ import lombok.experimental.Accessors;
@Data
@Accessors(chain = true)
@TransType("100028")
@TransType("231312")
public class CheckBillRequest implements ApiRequest {
/**
*

View File

@ -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;
}

View File

@ -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;
/**
* base64zip
*/
@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;
}

View File

@ -11,7 +11,7 @@ import lombok.experimental.Accessors;
*/
@Data
@Accessors(chain = true)
@TransType("100027")
@TransType("231311")
public class ReturnBillRequest implements ApiRequest {
/**
*

View File

@ -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<BmdAddResponse> 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<BmdDelResponse> 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<BmdListResponse> httpResponse = apiClient.post(url, headers, bmdListRequest.toJsonRequest(), BmdListResponse.class);

View File

@ -12,7 +12,7 @@ import lombok.experimental.Accessors;
*/
@Data
@Accessors(chain = true)
@TransType("100023")
@TransType("231403")
public class BmdAddRequest implements ApiRequest {
/**
*

View File

@ -12,7 +12,7 @@ import lombok.experimental.Accessors;
*/
@Data
@Accessors(chain = true)
@TransType("100024")
@TransType("231404")
public class BmdDelRequest implements ApiRequest {
/**
*

View File

@ -12,7 +12,7 @@ import lombok.experimental.Accessors;
*/
@Data
@Accessors(chain = true)
@TransType("100025")
@TransType("231405")
public class BmdListRequest implements ApiRequest {
/**
*

View File

@ -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<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 = "/loanapi/applyquery";
String url = "/loan/v2/query";
HttpHeaders headers = new HttpHeaders();
headers.addHeader(API_VERSION, V_1);
HttpResponse<ApplyQueryResponse> 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<ApplyQueryV2Response> 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<RepayResponse> 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<SignFlowsUrlsResponse> httpResponse = apiClient.post(url, headers, signFlowsUrlsRequest.toJsonRequest(), SignFlowsUrlsResponse.class);

View File

@ -18,7 +18,7 @@ import java.util.List;
*/
@Data
@Accessors(chain = true)
@TransType("102017")
@TransType("242603")
public class ApplyCompanyRequest implements ApiRequest {
/**
*

View File

@ -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 {
/**
*

View File

@ -14,7 +14,7 @@ import lombok.experimental.Accessors;
*/
@Data
@Accessors(chain = true)
@TransType("102002")
@TransType("242505")
public class ApplyQueryRequest implements ApiRequest {
/**
*

View File

@ -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 {
/**
*

View File

@ -14,7 +14,7 @@ import lombok.experimental.Accessors;
*/
@Data
@Accessors(chain = true)
@TransType("102006")
@TransType("243204")
public class RepayRequest implements ApiRequest {
/**
*

View File

@ -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 {
/**
*

View File

@ -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<MerWithdrawResponse> 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<MerWithdrawV2Response> 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<MerWithdrawCheckResponse> 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<MerDepositResponse> 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<MerDepositCheckResponse> httpResponse = apiClient.post(url, headers, merDepositCheckRequest.toJsonRequest(), MerDepositCheckResponse.class);
@ -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<EarnestInsureResponse> 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<EarnestReleaseResponse> httpResponse = apiClient.post(url, headers, earnestReleaseRequest.toJsonRequest(), EarnestReleaseResponse.class);

View File

@ -16,7 +16,7 @@ import java.math.BigDecimal;
*/
@Data
@Accessors(chain = true)
@TransType("102010")
@TransType("242403")
public class EarnestInsureRequest implements ApiRequest {
/**
*

View File

@ -16,7 +16,7 @@ import java.math.BigDecimal;
*/
@Data
@Accessors(chain = true)
@TransType("102011")
@TransType("242404")
public class EarnestReleaseRequest implements ApiRequest {
/**
*

View File

@ -14,7 +14,7 @@ import lombok.experimental.Accessors;
*/
@Data
@Accessors(chain = true)
@TransType("100021")
@TransType("231002")
public class MerDepositCheckRequest implements ApiRequest {
/**
*

View File

@ -16,7 +16,7 @@ import java.math.BigDecimal;
*/
@Data
@Accessors(chain = true)
@TransType("100020")
@TransType("231001")
public class MerDepositRequest implements ApiRequest {
/**
*

View File

@ -14,7 +14,7 @@ import lombok.experimental.Accessors;
*/
@Data
@Accessors(chain = true)
@TransType("100019")
@TransType("231102")
public class MerWithdrawCheckRequest implements ApiRequest {
/**
*

View File

@ -16,7 +16,7 @@ import java.math.BigDecimal;
*/
@Data
@Accessors(chain = true)
@TransType("100018")
@TransType("231101")
public class MerWithdrawRequest implements ApiRequest {
/**
*

View File

@ -14,7 +14,7 @@ import java.math.BigDecimal;
*/
@Data
@Accessors(chain = true)
@TransType("100035")
@TransType("231103")
public class MerWithdrawV2Request implements ApiRequest {
/**
*

View File

@ -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;