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

main
wb1608 2024-04-09 17:31:54 +08:00
commit 51d371fc51
8 changed files with 373 additions and 4 deletions

View File

@ -19,6 +19,33 @@ public class AccountService {
this.apiClient = apiClient;
}
/**
*
*
* @param openAccSubRequest OpenAccSubRequest
* @return OpenAccSubResponse
*/
public OpenAccSubResponse openAccSub(OpenAccSubRequest openAccSubRequest) {
String url = "/accInfo/openAccSub";
HttpHeaders headers = new HttpHeaders();
headers.addHeader(API_VERSION, V_1);
HttpResponse<OpenAccSubResponse> httpResponse = apiClient.post(url, headers, openAccSubRequest.toJsonRequest(), OpenAccSubResponse.class);
return httpResponse.getServiceResponse();
}
/**
* 簿-
*
* @param
* @return
*/
public void createAccount() {
}
/**
* 簿
*

View File

@ -0,0 +1,66 @@
package com.czcb.scfs.api.service.v1.account.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;
/**
*
*
* @author H.T
* @since 2.0.0
*/
@Data
@Accessors(chain = true)
@TransType("100032")
public class OpenAccSubRequest implements ApiRequest {
/**
*
*/
@SerializedName("channel_no")
private String channelNo;
/**
*
*/
@SerializedName("app_no")
private String appNo;
/**
*
*/
@SerializedName("serial_no")
private String serialNo;
/**
* A1
*/
@SerializedName("account_no")
private String accountNo;
/**
* A1
*/
@SerializedName("account_name")
private String accountName;
/**
* 6A2
*/
@SerializedName("account_class")
private String accountClass;
/**
* YYYY-MM-DD
*/
@SerializedName("trans_date")
private String transDate;
/**
* YYYY-MM-DD hh:mm:ss
*/
@SerializedName("trans_tradetime")
private String transTradeTime;
}

View File

@ -0,0 +1,48 @@
package com.czcb.scfs.api.service.v1.account.model;
import com.czcb.scfs.api.core.ApiResponse;
import com.google.gson.annotations.SerializedName;
import lombok.Data;
/**
* @author H.T
* @since 2.0.0
*/
@Data
public class OpenAccSubResponse implements ApiResponse {
/**
* 000000
*/
@SerializedName("recode")
private String recode;
/**
*
*/
@SerializedName("recode_info")
private String recodeInfo;
/**
* A2
*/
@SerializedName("sub_account_no")
private String subAccountNo;
/**
* A2
*/
@SerializedName("sub_account_name")
private String subAccountName;
/**
* YYYY-MM-DD
*/
@SerializedName("sys_date")
private String sysDate;
/**
* YYYY-MM-DD hh:mm:ss
*/
@SerializedName("sys_time")
private String sysTime;
}

View File

@ -50,4 +50,15 @@ public class FileService {
HttpResponse<DownloadFileResponse> httpResponse = apiClient.post(url, headers, request.toJsonRequest(), DownloadFileResponse.class);
return httpResponse.getServiceResponse();
}
/**
*
*
* @param
* @return
*/
public void balanceBill() {
}
}

View File

@ -33,6 +33,16 @@ public class PayService {
return httpResponse.getServiceResponse();
}
/**
*
*
* @param
* @return
*/
public void merWithdrawV2() {
}
/**
*
*

View File

@ -3,10 +3,7 @@ package com.czcb.scfs.api.service.v1.trans;
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.trans.model.QueryTradeInfoRequest;
import com.czcb.scfs.api.service.v1.trans.model.QueryTradeInfoResponse;
import com.czcb.scfs.api.service.v1.trans.model.QueryTradeListRequest;
import com.czcb.scfs.api.service.v1.trans.model.QueryTradeListResponse;
import com.czcb.scfs.api.service.v1.trans.model.*;
import static com.czcb.scfs.api.core.Constants.API_VERSION;
import static com.czcb.scfs.api.core.Constants.V_1;
@ -49,4 +46,18 @@ public class TransService {
HttpResponse<QueryTradeInfoResponse> httpResponse = apiClient.post(url, headers, queryTradeInfoRequest.toJsonRequest(), QueryTradeInfoResponse.class);
return httpResponse.getServiceResponse();
}
/**
* 1
*
* @param queryTradeListNewRequest QueryTradeListNewRequest
* @return QueryTradeListNewResponse
*/
public QueryTradeListNewResponse queryTradeListNew(QueryTradeListNewRequest queryTradeListNewRequest) {
String url = "/tradeDetails/queryTradeList1";
HttpHeaders headers = new HttpHeaders();
headers.addHeader(API_VERSION, V_1);
HttpResponse<QueryTradeListNewResponse> httpResponse = apiClient.post(url, headers, queryTradeListNewRequest.toJsonRequest(), QueryTradeListNewResponse.class);
return httpResponse.getServiceResponse();
}
}

View File

@ -0,0 +1,70 @@
package com.czcb.scfs.api.service.v1.trans.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;
/**
* @author H.T
* @since 2.0.0
*/
@Data
@Accessors(chain = true)
@TransType("100033")
public class QueryTradeListNewRequest 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;
/**
* YYYY-MM-DD
*/
@SerializedName("trans_date")
private String transDate;
/**
* 0 limit 010000limit 1000020000
*/
@SerializedName("page")
private Integer page;
/**
* 10000
*/
@SerializedName("rows")
private Integer rows;
}

View File

@ -0,0 +1,126 @@
package com.czcb.scfs.api.service.v1.trans.model;
import com.czcb.scfs.api.core.ApiResponse;
import com.google.gson.annotations.SerializedName;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.List;
/**
* @author H.T
* @since 2.0.0
*/
@Data
public class QueryTradeListNewResponse implements ApiResponse {
/**
* 000000
*/
@SerializedName("recode")
private String recode;
/**
*
*/
@SerializedName("recode_info")
private String recodeInfo;
/**
*
*/
@SerializedName("account_no")
private String accountNo;
/**
*
*/
@SerializedName("account_name")
private String accountName;
/**
*
*/
@SerializedName("id_type")
private String idType;
/**
*
*/
@SerializedName("id_no")
private String idNo;
/**
*
*/
@SerializedName("mobile")
private String mobile;
/**
*
*/
@SerializedName("cur_balance")
private BigDecimal curBalance;
/**
*
*/
@SerializedName("avail_balance")
private BigDecimal availBalance;
/**
*
*/
@SerializedName("withdraw_balance")
private BigDecimal withdrawBalance;
/**
*
*/
@SerializedName("pre_balance")
private BigDecimal preBalance;
/**
*
*/
@SerializedName("detail_list")
private List<DetailList> detailList;
/**
* YYYY-MM-DD
*/
@SerializedName("sys_date")
private String sysDate;
/**
* YYYY-MM-DD hh:mm:ss
*/
@SerializedName("sys_time")
private String sysTime;
@Data
public static class DetailList implements Serializable {
// .id Int Y 内码ID可用来排序
//.account_date C10 Y 记账日期
//.trade_time C19 Y 交易时间
//.detail_type C1 Y 明细类型 0交易 1结转
//.trans_type C1 Y 交易类型 0其他 1开户 2修改 3销户 4存款 5取款 6转入 7转出 8撤销
//.trade_no C32 N 交易码=功能号trans_type
// .original_serialno C32 Y 原交易流水号
//.serial_no C32 Y 系统交易流水号
//.trans_amount N16,2 Y 交易金额
//.total_amount N16,2 Y 交易总额
//.trans_fee N16,2 Y 手续费
//.balance N16,2 Y 余额
//.channel_no C32 Y 渠道编号
//.opp_account_no C32 N 对方账号
//.opp_account_name C60 N 对方户名
//.remark C200 N 摘要
}
}