worker.bank
/
scfs-api-sdk
4
0
Fork 0
Code Issues Pull Requests Packages Projects 1 Releases 1 Wiki Activity

fix:肥猫接口字段变更

main
wb1608 2024-07-30 15:14:12 +08:00
parent ce193957e2
commit 49e1dcd0e9
6 changed files with 124 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/cat/project/ProjectService.java
View File

@ -20,7 +20,7 @@ public class ProjectService {
}
/**
* 订单查询（贸易订单）
* 订单登记（贸易订单）
*/
public ProjectAddResponse projectAdd(ProjectAddRequest projectAddRequest) {
String url = "/purchase/project-add";

18
scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/cat/project/model/ProjectAddRequest.java
View File

@ -192,6 +192,24 @@ public class ProjectAddRequest implements ApiRequest {
@SerializedName("project_amount")
private BigDecimal projectAmount;
/**
* 保证金总额1
*/
@SerializedName("gd_amount_1")
private BigDecimal gdAmount1;
/**
* 保证金总额2
*/
@SerializedName("gd_amount_2")
private BigDecimal gdAmount2;
/**
* 保证金总额3
*/
@SerializedName("gd_amount_3")
private BigDecimal gdAmount3;
/**
* 摘要
*/

80
scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/cat/project/model/ProjectPayRequest.java
View File

@ -50,21 +50,12 @@ public class ProjectPayRequest implements ApiRequest {
@SerializedName("trans_tradetime")
private String transTradeTime;
/**
* 项目编号
*/
@SerializedName("project_no")
private String projectNo;
/**
* 支付金额
*/
@SerializedName("pay_amount")
private String payAmount;
/**
* 提款金额 提款金额<= 支付金额*融资比例
*/
@SerializedName("loan_amount")
private BigDecimal loanAmount;
/**
* 支付类型：1、余额支付 5、融资支付
*/
@ -84,17 +75,78 @@ public class ProjectPayRequest implements ApiRequest {
private String applyAccountName;
/**
* 支付账户账号(拆厂公司A1)
* 提款金额 提款金额<= （支付金额+保证金释放金额）*融资比例
*/
@SerializedName("loan_amount")
private BigDecimal loanAmount;
/**
* 付款账户A1账号（拆厂公司A1/供应链管理公司A1/有资质拆厂公司A1）
*/
@SerializedName("account_no")
private String accountNo;
/**
* 付款账户A1户名（拆厂公司A1/供应链管理公司A1/有资质拆厂公司A1）
*/
@SerializedName("account_name")
private String accountName;
/**
* 冻结金额（劣后资金，付款账户A1冻结到付款账户A2）
* 大于等于0 小于等于支付总额-提款金额
*/
@SerializedName("freeze_amount")
private BigDecimal freezeAmount;
/**
* 付款账户A2账号（拆厂公司A2/供应链管理公司A2/有资质拆厂公司A2）
*/
@SerializedName("pay_account_no")
private String payAccountNo;
/**
* 支付账户户名(拆厂公司A1)
* 付款账户A2户名（拆厂公司A2/供应链管理公司A2/有资质拆厂公司A2）
*/
@SerializedName("pay_account_name")
private String payAccountName;
/**
* 支付金额
*/
@SerializedName("pay_amount")
private BigDecimal payAmount;
/**
* 保证金释放金额
*/
@SerializedName("gd_amount_release")
private BigDecimal gdAmountRelease;
/**
* 收款账户账号（供应链管理公司A2/有资质拆厂公司A2/业主公司）
*/
@SerializedName("opp_account_no")
private String oppAccountNo;
/**
* 收款账户户名（供应链管理公司A2/有资质拆厂公司A2/业主公司）
*/
@SerializedName("opp_account_name")
private String oppAccountName;
/**
* 收款账户行号（供应链管理公司A2/有资质拆厂公司A2/业主公司）
*/
@SerializedName("opp_bank_no")
private String oppBankNo;
/**
* 收款账户行名（供应链管理公司A2/有资质拆厂公司A2/业主公司）
*/
@SerializedName("opp_bank_name")
private String oppBankName;
/**
* 验证码，短信验证码（如果支付类型是 1 则订单付款账户的手机号接收，如果支付类型是5则贷款申请账户的手机号接收） 短信类型：9，短信模版编号：103803
*/

36
scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/cat/project/model/ProjectQueryResponse.java
View File

@ -228,6 +228,42 @@ public class ProjectQueryResponse implements ApiResponse {
@SerializedName("project_amount")
private BigDecimal projectAmount;
/**
* 保证金总额1
*/
@SerializedName("gd_amount_1")
private BigDecimal gdAmount1;
/**
* 保证金释放总额1
*/
@SerializedName("gd_amount_release_1")
private BigDecimal gdAmountRelease1;
/**
* 保证金总额2
*/
@SerializedName("gd_amount_2")
private BigDecimal gdAmount2;
/**
* 保证金释放总额2
*/
@SerializedName("gd_amount_release_2")
private BigDecimal gdAmountRelease2;
/**
* 保证金总额3
*/
@SerializedName("gd_amount_3")
private BigDecimal gdAmount3;
/**
* 保证金释放总额3
*/
@SerializedName("gd_amount_release_3")
private BigDecimal gdAmountRelease3;
/**
* 项目说明
*/

2
scfs-api-test/src/main/resources/application.properties
View File

@ -2,7 +2,7 @@ scfs.api-gateway.online=false
#scfs.api-gateway.host=http://10.131.98.80:8088/api-gateway
scfs.api-gateway.host=http://10.129.155.38:8088/api-gateway
#scfs.api-gateway.host=http://127.0.0.1:8088/api-gateway
scfs.api-gateway.channel.channel-no=1039
scfs.api-gateway.channel.channel-no=1021
scfs.api-gateway.channel.app-no=42
scfs.api-gateway.cipher.store-type=resources
#scfs.api-gateway.cipher.channel-private-key=invalid_rsa_private_key.pem

4
scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/InvoiceServiceTest.java
View File

@ -28,7 +28,7 @@ class InvoiceServiceTest {
void matchTest() {
InvoiceSettleMatchRequest request = new InvoiceSettleMatchRequest();
request.setChannelNo("1039");
request.setAppNo("21");
request.setAppNo("42");
request.setSerialNo("123456");
request.setTransDate("2024-07-24");
request.setTransTradeTime("2024-07-24 15:52:11");
@ -62,7 +62,7 @@ class InvoiceServiceTest {
void invoiceSettleRepay() {
InvoiceSettleRepayRequest request = new InvoiceSettleRepayRequest();
request.setChannelNo("1039");
request.setAppNo("42");
request.setAppNo("21");
request.setSerialNo("12121212");
request.setTransDate("2024-07-24");
request.setTransTradeTime("2024-07-24 15:52:11");