Merge remote-tracking branch 'origin/dev' into dev
commit
51d371fc51
|
|
@ -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() {
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 开立一个客户电子登记簿账户(主账户) 个人
|
||||
*
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
/**
|
||||
* 账户类型 6、冻结(A2账户对应类型)
|
||||
*/
|
||||
@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;
|
||||
}
|
||||
|
|
@ -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;
|
||||
}
|
||||
|
|
@ -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() {
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,6 +33,16 @@ public class PayService {
|
|||
return httpResponse.getServiceResponse();
|
||||
}
|
||||
|
||||
/**
|
||||
* 提现
|
||||
*
|
||||
* @param
|
||||
* @return
|
||||
*/
|
||||
public void merWithdrawV2() {
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 提现查证
|
||||
*
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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 0,10000;limit 10000,20000)
|
||||
*/
|
||||
@SerializedName("page")
|
||||
private Integer page;
|
||||
|
||||
/**
|
||||
* 总行数 默认 10000
|
||||
*/
|
||||
@SerializedName("rows")
|
||||
private Integer rows;
|
||||
}
|
||||
|
|
@ -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 摘要
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
Loading…
Reference in New Issue