diff --git a/pom.xml b/pom.xml index f7acc5b..db3fbb5 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.czcb.scfs scfs-api-sdk - 2.0.19 + 2.0.21-snapshot scfs-api-sdk scfs-api-sdk pom @@ -75,27 +75,27 @@ com.czcb.scfs scfs-api-core - 2.0.19 + 2.0.21-snapshot com.czcb.scfs scfs-api-rsa - 2.0.19 + 2.0.21-snapshot com.czcb.scfs scfs-api-service - 2.0.19 + 2.0.21-snapshot com.czcb.scfs scfs-api-sm - 2.0.19 + 2.0.21-snapshot com.czcb.scfs scfs-api-spring-boot-starter - 2.0.19 + 2.0.21-snapshot diff --git a/readme.md b/readme.md index b490002..c5ed7db 100644 --- a/readme.md +++ b/readme.md @@ -63,10 +63,10 @@ openssl x509 -req -days 3650 -in rsa_csr.pem -signkey rsa_private_key.pem -out r ```shell # 开发测试阶段使用快照版本 -mvn versions:set -DnewVersion=2.0.19-snapshot +mvn versions:set -DnewVersion=2.0.21-snapshot # 正式版本，版本号加一 -mvn versions:set -DnewVersion=2.0.19 +mvn versions:set -DnewVersion=2.0.21 ``` ## 代码扫描 diff --git a/scfs-api-core/pom.xml b/scfs-api-core/pom.xml index 59c33c3..92c0179 100644 --- a/scfs-api-core/pom.xml +++ b/scfs-api-core/pom.xml @@ -5,11 +5,11 @@ com.czcb.scfs scfs-api-sdk - 2.0.19 + 2.0.21-snapshot scfs-api-core - 2.0.19 + 2.0.21-snapshot scfs-api-core:核心模块 scfs-api-core jar diff --git a/scfs-api-rsa/pom.xml b/scfs-api-rsa/pom.xml index 0a28d84..9790502 100644 --- a/scfs-api-rsa/pom.xml +++ b/scfs-api-rsa/pom.xml @@ -5,11 +5,11 @@ com.czcb.scfs scfs-api-sdk - 2.0.19 + 2.0.21-snapshot scfs-api-rsa - 2.0.19 + 2.0.21-snapshot scfs-api-rsa:RSA模块 封装RSA、AES国密算法 @@ -17,7 +17,7 @@ com.czcb.scfs scfs-api-core - 2.0.19 + 2.0.21-snapshot diff --git a/scfs-api-service/pom.xml b/scfs-api-service/pom.xml index 5403daa..5d98ecb 100644 --- a/scfs-api-service/pom.xml +++ b/scfs-api-service/pom.xml @@ -5,11 +5,11 @@ com.czcb.scfs scfs-api-sdk - 2.0.19 + 2.0.21-snapshot scfs-api-service - 2.0.19 + 2.0.21-snapshot scfs-api-service:业务接口模型 业务接口模型 jar @@ -24,7 +24,7 @@ com.czcb.scfs scfs-api-core - 2.0.19 + 2.0.21-snapshot diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/ModAccCompanyRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/ModAccCompanyRequest.java index fbe0727..dff24ec 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/ModAccCompanyRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/ModAccCompanyRequest.java @@ -80,6 +80,12 @@ public class ModAccCompanyRequest implements ApiRequest { @SerializedName("id_enddate") private String idEndDate; + /** + * 证件地址 + */ + @SerializedName("id_address") + private String idAddress; + /** * 签发机关 */ diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/PayService.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/PayService.java index f203174..3a2a1e1 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/PayService.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/PayService.java @@ -194,4 +194,60 @@ public class PayService { HttpResponse httpResponse = apiClient.post(url, headers, request.toJsonRequest(), OfflineRechargeRefundResponse.class); return httpResponse.getServiceResponse(); } + + /** + * 232308-收付款白名单登记 + * + * @author dqy + * @since 2025/7/4 + */ + public WhiteListPayAddResponse whiteListPayAdd(WhiteListPayAddRequest request) { + String url = "/white-list-pay/add"; + HttpHeaders headers = new HttpHeaders(); + headers.addHeader(API_VERSION, V_2); + HttpResponse httpResponse = apiClient.post(url, headers, request.toJsonRequest(), WhiteListPayAddResponse.class); + return httpResponse.getServiceResponse(); + } + + /** + * 232307-通用白名单收款 + * + * @author dqy + * @since 2025/7/4 + */ + public WhiteListPayResponse whiteListPay(WhiteListPayRequest request) { + String url = "/white-list-pay/payment"; + HttpHeaders headers = new HttpHeaders(); + headers.addHeader(API_VERSION, V_2); + HttpResponse httpResponse = apiClient.post(url, headers, request.toJsonRequest(), WhiteListPayResponse.class); + return httpResponse.getServiceResponse(); + } + + /** + * 232306-收付款白名单分页查询 + * + * @author dqy + * @since 2025/7/4 + */ + public WhiteListPayQueryResponse whiteListPayQuery(WhiteListPayQueryRequest request) { + String url = "/white-list-pay/find/page"; + HttpHeaders headers = new HttpHeaders(); + headers.addHeader(API_VERSION, V_2); + HttpResponse httpResponse = apiClient.post(url, headers, request.toJsonRequest(), WhiteListPayQueryResponse.class); + return httpResponse.getServiceResponse(); + } + + /** + * 232302-收付款白名单删除（单笔） + * + * @author dqy + * @since 22025/7/4 + */ + public WhiteListPayDeleteResponse whiteListPayDelete(WhiteListPayDeleteRequest request) { + String url = "/white-list-pay/remove"; + HttpHeaders headers = new HttpHeaders(); + headers.addHeader(API_VERSION, V_2); + HttpResponse httpResponse = apiClient.post(url, headers, request.toJsonRequest(), WhiteListPayDeleteResponse.class); + return httpResponse.getServiceResponse(); + } } diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/WhiteListPayAddRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/WhiteListPayAddRequest.java new file mode 100644 index 0000000..41e77dd --- /dev/null +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/WhiteListPayAddRequest.java @@ -0,0 +1,76 @@ +package com.czcb.scfs.api.service.v2.pay.model; + +import com.czcb.scfs.api.core.ApiRequest; +import com.czcb.scfs.api.core.agrs.TransType; +import com.google.gson.annotations.SerializedName; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.math.BigDecimal; + +/******************************************************* + *系统名称: sdk + *版本号: V1.0.0 + *开发人员: 丁秋宇 + *创建日期: 2025/07/04 14:00 + *---------------------------------------------------- + *业务模块: scfs-api-sdk + *程序功能: + *******************************************************/ + +@Data +@Accessors(chain = true) +@TransType("232308") +public class WhiteListPayAddRequest implements ApiRequest { + + /** + * 渠道编号 + */ + @SerializedName("channel_no") + private String channelNo; + + /** + * 应用编号 + */ + @SerializedName("app_no") + private String appNo; + + /** + * 流水号 + */ + @SerializedName("serial_no") + private String serialNo; + + /** + * 操作日期 + */ + @SerializedName("trans_date") + private String transDate; + + /** + * 操作时间 + */ + @SerializedName("trans_tradetime") + private String transTradeTime; + + @SerializedName("white_type") + private String whiteType; + + @SerializedName("account_no") + private String accountNo; + + @SerializedName("account_name") + private String accountName; + + @SerializedName("bank_no") + private String bankNo; + + @SerializedName("bank_name") + private String bankName; + + @SerializedName("note") + private String note; + + @SerializedName("verify_code") + private String verifyCode; +} \ No newline at end of file diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/WhiteListPayAddResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/WhiteListPayAddResponse.java new file mode 100644 index 0000000..d120983 --- /dev/null +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/WhiteListPayAddResponse.java @@ -0,0 +1,51 @@ +package com.czcb.scfs.api.service.v2.pay.model; + +import com.czcb.scfs.api.core.ApiResponse; +import com.google.gson.annotations.SerializedName; +import lombok.Data; +import lombok.experimental.Accessors; + +/******************************************************* + *系统名称: sdk + *版本号: V1.0.0 + *开发人员: 丁秋宇 + *创建日期: 2025/07/04 13:58 + *---------------------------------------------------- + *业务模块: scfs-api-sdk + *程序功能: + *******************************************************/ + +@Data +@Accessors(chain = true) +public class WhiteListPayAddResponse implements ApiResponse { + + /** + * 000000：表示成功 + */ + @SerializedName("recode") + private String recode; + + /** + * 结果信息 + */ + @SerializedName("recode_info") + private String recodeInfo; + + /** + * 系统流水号 + */ + @SerializedName("sys_serial_no") + private String sysSerialNo; + + /** + * 系统日期（YYYY-MM-DD） + */ + @SerializedName("sys_date") + private String sysDate; + + /** + * 系统时间（YYYY-MM-DD hh:mm:ss） + */ + @SerializedName("sys_time") + private String sysTime; +} \ No newline at end of file diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/WhiteListPayDeleteDTO.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/WhiteListPayDeleteDTO.java new file mode 100644 index 0000000..d1bb478 --- /dev/null +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/WhiteListPayDeleteDTO.java @@ -0,0 +1,25 @@ +package com.czcb.scfs.api.service.v2.pay.model; + +import com.google.gson.annotations.SerializedName; +import lombok.Data; +import lombok.experimental.Accessors; + +/******************************************************* + *系统名称: 银行核心业务系统 + *版本号: V1.0.0 + *开发人员: 丁秋宇 + *创建日期: 2025/07/04 14:57 + *---------------------------------------------------- + *业务模块: scfs-api-sdk + *程序功能: + *******************************************************/ +@Data +@Accessors(chain = true) +public class WhiteListPayDeleteDTO { + + /** + * 内码ID + */ + @SerializedName("id") + private int id; +} \ No newline at end of file diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/WhiteListPayDeleteRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/WhiteListPayDeleteRequest.java new file mode 100644 index 0000000..0056aa3 --- /dev/null +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/WhiteListPayDeleteRequest.java @@ -0,0 +1,58 @@ +package com.czcb.scfs.api.service.v2.pay.model; + +import com.czcb.scfs.api.core.ApiRequest; +import com.czcb.scfs.api.core.agrs.TransType; +import com.google.gson.annotations.SerializedName; +import lombok.Data; +import lombok.experimental.Accessors; + +/******************************************************* + *系统名称: sdk + *版本号: V1.0.0 + *开发人员: 丁秋宇 + *创建日期: 2025/07/04 14:54 + *---------------------------------------------------- + *业务模块: scfs-api-sdk + *程序功能: + *******************************************************/ +@Data +@Accessors(chain = true) +@TransType("232302") +public class WhiteListPayDeleteRequest implements ApiRequest { + /** + * 渠道编号 + */ + @SerializedName("channel_no") + private String channelNo; + + /** + * 应用编号 + */ + @SerializedName("app_no") + private String appNo; + + /** + * 流水号 + */ + @SerializedName("serial_no") + private String serialNo; + + /** + * 操作日期 + */ + @SerializedName("trans_date") + private String transDate; + + /** + * 操作时间 + */ + @SerializedName("trans_tradetime") + private String transTradeTime; + + /** + * c参数 + */ + @SerializedName("data") + private WhiteListPayDeleteDTO whiteListPayDeleteDTO; + +} \ No newline at end of file diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/WhiteListPayDeleteResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/WhiteListPayDeleteResponse.java new file mode 100644 index 0000000..2482455 --- /dev/null +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/WhiteListPayDeleteResponse.java @@ -0,0 +1,52 @@ +package com.czcb.scfs.api.service.v2.pay.model; + +import com.czcb.scfs.api.core.ApiResponse; +import com.google.gson.annotations.SerializedName; +import lombok.Data; +import lombok.experimental.Accessors; + +/******************************************************* + *系统名称: 银行核心业务系统 + *版本号: V1.0.0 + *开发人员: 丁秋宇 + *创建日期: 2025/07/04 14:54 + *---------------------------------------------------- + *业务模块: scfs-api-sdk + *程序功能: + *******************************************************/ + +@Data +@Accessors(chain = true) +public class WhiteListPayDeleteResponse implements ApiResponse { + + /** + * 000000：表示成功 + */ + @SerializedName("recode") + private String recode; + + /** + * 结果信息 + */ + @SerializedName("recode_info") + private String recodeInfo; + + /** + * 系统流水号 + */ + @SerializedName("sys_serial_no") + private String sysSerialNo; + + /** + * 系统日期（YYYY-MM-DD） + */ + @SerializedName("sys_date") + private String sysDate; + + /** + * 系统时间（YYYY-MM-DD hh:mm:ss） + */ + @SerializedName("sys_time") + private String sysTime; + +} \ No newline at end of file diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/WhiteListPayQueryDTO.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/WhiteListPayQueryDTO.java new file mode 100644 index 0000000..6993024 --- /dev/null +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/WhiteListPayQueryDTO.java @@ -0,0 +1,68 @@ +package com.czcb.scfs.api.service.v2.pay.model; + +import com.google.gson.annotations.SerializedName; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.util.Date; + +/******************************************************* + *系统名称: sdk + *版本号: V1.0.0 + *开发人员: 丁秋宇 + *创建日期: 2025/07/04 14:40 + *---------------------------------------------------- + *业务模块: scfs-api-sdk + *程序功能: + *******************************************************/ +@Data +@Accessors(chain = true) +public class WhiteListPayQueryDTO { + + /** + * 白名单类型 0、收付款白名单 1、收款白名单 2、付款白名单 + */ + @SerializedName("white_type") + private String whiteType; + /** + * 账户类型 1、电子账户 2、实体账户 + */ + @SerializedName("account_type") + private String accountType; + /** + * 作用范围 0、全渠道 1、归属渠道 + */ + @SerializedName("used_range") + private String usedRange; + /** + * 渠道编号 全渠道填 0000 + */ + @SerializedName("channel_no") + private String channelNo; + /** + * 收付款账号 + */ + @SerializedName("account_no") + private String accountNo; + /** + * 收付款户名 + */ + @SerializedName("account_name") + private String accountName; + /** + * 银行行号 + */ + @SerializedName("bank_no") + private String bankNo; + /** + * 银行行名 + */ + @SerializedName("bank_name") + private String bankName; + /** + * 备注 + */ + @SerializedName("note") + private String note; + +} \ No newline at end of file diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/WhiteListPayQueryRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/WhiteListPayQueryRequest.java new file mode 100644 index 0000000..f64a97e --- /dev/null +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/WhiteListPayQueryRequest.java @@ -0,0 +1,70 @@ +package com.czcb.scfs.api.service.v2.pay.model; + +import com.czcb.scfs.api.core.PageApiRequest; +import com.czcb.scfs.api.core.agrs.TransType; +import com.google.gson.annotations.SerializedName; +import lombok.Data; +import lombok.experimental.Accessors; + +/******************************************************* + *系统名称: 银行核心业务系统 + *版本号: V1.0.0 + *开发人员: 丁秋宇 + *创建日期: 2025/07/04 14:29 + *---------------------------------------------------- + *业务模块: scfs-api-sdk + *程序功能: + *******************************************************/ +@Data +@Accessors(chain = true) +@TransType("232306") +public class WhiteListPayQueryRequest implements PageApiRequest { + /** + * 渠道编号 + */ + @SerializedName("channel_no") + private String channelNo; + + /** + * 应用编号 + */ + @SerializedName("app_no") + private String appNo; + + /** + * 流水号 + */ + @SerializedName("serial_no") + private String serialNo; + + /** + * 操作日期 + */ + @SerializedName("trans_date") + private String transDate; + + /** + * 操作时间 + */ + @SerializedName("trans_tradetime") + private String transTradeTime; + + + /** + * 当前页码，默认0 + */ + @SerializedName("current_page") + private Long currentPage = 0L; + + /** + * 每页行数，默认50 + */ + @SerializedName("current_rows") + private Long currentRows = 50L; + + /** + * 芬特参数 + */ + @SerializedName("data") + private WhiteListPayQueryDTO whiteListPayQueryDTO; +} \ No newline at end of file diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/WhiteListPayQueryResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/WhiteListPayQueryResponse.java new file mode 100644 index 0000000..34bea6f --- /dev/null +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/WhiteListPayQueryResponse.java @@ -0,0 +1,75 @@ +package com.czcb.scfs.api.service.v2.pay.model; + +import com.czcb.scfs.api.core.ApiResponse; +import com.google.gson.annotations.SerializedName; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.util.List; + +/******************************************************* + *系统名称: sdk + *版本号: V1.0.0 + *开发人员: 丁秋宇 + *创建日期: 2025/07/04 14:28 + *---------------------------------------------------- + *业务模块: scfs-api-sdk + *程序功能: + *******************************************************/ +@Data +@Accessors(chain = true) +public class WhiteListPayQueryResponse implements ApiResponse { + + /** + * 000000：表示成功 + */ + @SerializedName("recode") + private String recode; + + /** + * 结果信息 + */ + @SerializedName("recode_info") + private String recodeInfo; + + /** + * 系统流水号 + */ + @SerializedName("sys_serial_no") + private String sysSerialNo; + + /** + * 系统日期（YYYY-MM-DD） + */ + @SerializedName("sys_date") + private String sysDate; + + /** + * 系统时间（YYYY-MM-DD hh:mm:ss） + */ + @SerializedName("sys_time") + private String sysTime; + + /** + * 当前页码 + */ + @SerializedName("current_page") + private Long currentPage; + + /** + * 总页数 + */ + @SerializedName("total_page") + private Long totalPage; + + /** + * 数据总条数 + */ + @SerializedName("total_rows") + private Long totalRows; + /** + * 分页查询返回参数 + */ + @SerializedName("data") + private List whiteListPayQueryResponseDTO; +} \ No newline at end of file diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/WhiteListPayQueryResponseDTO.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/WhiteListPayQueryResponseDTO.java new file mode 100644 index 0000000..2f80754 --- /dev/null +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/WhiteListPayQueryResponseDTO.java @@ -0,0 +1,99 @@ +package com.czcb.scfs.api.service.v2.pay.model; + +import com.google.gson.annotations.SerializedName; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.util.Date; + +/******************************************************* + *系统名称: sdk + *版本号: V1.0.0 + *开发人员: 丁秋宇 + *创建日期: 2025/07/04 14:46 + *---------------------------------------------------- + *业务模块: scfs-api-sdk + *程序功能: + *******************************************************/ +@Data +@Accessors(chain = true) +public class WhiteListPayQueryResponseDTO { + + /** + * 主键ID 自增长 + */ + @SerializedName("id") + private Integer id; + /** + * 白名单类型 0、收付款白名单 1、收款白名单 2、付款白名单 + */ + @SerializedName("white_type") + private String whiteType; + /** + * 账户类型 1、电子账户 2、实体账户 + */ + @SerializedName("account_type") + private String accountType; + /** + * 作用范围 0、全渠道 1、归属渠道 + */ + @SerializedName("used_range") + private String usedRange; + /** + * 渠道编号 全渠道填 0000 + */ + @SerializedName("channel_no") + private String channelNo; + /** + * 收付款账号 + */ + @SerializedName("account_no") + private String accountNo; + /** + * 收付款户名 + */ + @SerializedName("account_name") + private String accountName; + /** + * 银行行号 + */ + @SerializedName("bank_no") + private String bankNo; + /** + * 银行行名 + */ + @SerializedName("bank_name") + private String bankName; + /** + * 备注 + */ + @SerializedName("note") + private String note; + /** + * 创建时间 + */ + @SerializedName("create_time") + private Date createTime; + /** + * 创建人 + */ + @SerializedName("creater") + private String creater; + /** + * 更新时间 + */ + @SerializedName("update_time") + private Date updateTime; + /** + * 更新人 + */ + @SerializedName("updater") + private String updater; + /** + * 记录状态（0：正常 1：删除） + */ + @SerializedName("record_status") + private String recordStatus; + + +} \ No newline at end of file diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/WhiteListPayRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/WhiteListPayRequest.java new file mode 100644 index 0000000..8b03827 --- /dev/null +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/WhiteListPayRequest.java @@ -0,0 +1,77 @@ +package com.czcb.scfs.api.service.v2.pay.model; + +import com.czcb.scfs.api.core.ApiRequest; +import com.czcb.scfs.api.core.ApiResponse; +import com.czcb.scfs.api.core.agrs.TransType; +import com.google.gson.annotations.SerializedName; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.math.BigDecimal; + +/******************************************************* + *系统名称: sdk + *版本号: V1.0.0 + *开发人员: 丁秋宇 + *创建日期: 2025/07/04 14:17 + *---------------------------------------------------- + *业务模块: scfs-api-sdk + *程序功能: + *******************************************************/ + +@Data +@Accessors(chain = true) +@TransType("232307") +public class WhiteListPayRequest implements ApiRequest { + + /** + * 渠道编号 + */ + @SerializedName("channel_no") + private String channelNo; + + /** + * 应用编号 + */ + @SerializedName("app_no") + private String appNo; + + /** + * 流水号 + */ + @SerializedName("serial_no") + private String serialNo; + + /** + * 操作日期 + */ + @SerializedName("trans_date") + private String transDate; + + /** + * 操作时间 + */ + @SerializedName("trans_tradetime") + private String transTradeTime; + + + @SerializedName("account_no") + private String accountNo; + + @SerializedName("account_name") + private String accountName; + + @SerializedName("opp_account_no") + private String oppAccountNo; + + @SerializedName("opp_account_name") + private String oppAccountName; + + + @SerializedName("trans_amount") + private BigDecimal transAmount; + + + @SerializedName("remark") + private String remark; +} \ No newline at end of file diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/WhiteListPayResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/WhiteListPayResponse.java new file mode 100644 index 0000000..ec7bdc2 --- /dev/null +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/WhiteListPayResponse.java @@ -0,0 +1,51 @@ +package com.czcb.scfs.api.service.v2.pay.model; + +import com.czcb.scfs.api.core.ApiResponse; +import com.google.gson.annotations.SerializedName; +import lombok.Data; +import lombok.experimental.Accessors; + +/******************************************************* + *系统名称: sdk + *版本号: V1.0.0 + *开发人员: 丁秋宇 + *创建日期: 2025/07/04 14:15 + *---------------------------------------------------- + *业务模块: scfs-api-sdk + *程序功能: + *******************************************************/ + +@Data +@Accessors(chain = true) +public class WhiteListPayResponse implements ApiResponse { + + /** + * 000000：表示成功 + */ + @SerializedName("recode") + private String recode; + + /** + * 结果信息 + */ + @SerializedName("recode_info") + private String recodeInfo; + + /** + * 系统流水号 + */ + @SerializedName("sys_serial_no") + private String sysSerialNo; + + /** + * 系统日期（YYYY-MM-DD） + */ + @SerializedName("sys_date") + private String sysDate; + + /** + * 系统时间（YYYY-MM-DD hh:mm:ss） + */ + @SerializedName("sys_time") + private String sysTime; +} \ No newline at end of file diff --git a/scfs-api-service/src/test/java/com/czcb/scfs/api/service/v2/account/AccountServiceTest.java b/scfs-api-service/src/test/java/com/czcb/scfs/api/service/v2/account/AccountServiceTest.java index c2f74d2..8532cf9 100644 --- a/scfs-api-service/src/test/java/com/czcb/scfs/api/service/v2/account/AccountServiceTest.java +++ b/scfs-api-service/src/test/java/com/czcb/scfs/api/service/v2/account/AccountServiceTest.java @@ -158,8 +158,7 @@ class AccountServiceTest { String requestJson = Json.toJson(request); System.out.println(requestJson); - Assertions.assertEquals("{\"channel_no\":\"setChannelNo\",\"app_no\":\"setAppNo\",\"serial_no\":\"setSerialNo\",\"account_no\":\"setAccountNo\",\"trade_no\":\"setTradeNo\",\"verify_code\":\"setVerifyCode\",\"account_property\":\"setAccountProperty\",\"id_type\":\"setIdType\",\"id_no\":\"setIdNo\",\"id_startdate\":\"setIdStartDate\",\"id_enddate\":\"setIdEndDate\",\"sign_name\":\"setSignName\",\"sign_no\":\"setSignNo\",\"mobile\":\"setMobile\",\"primary_account\":\"setPrimaryAccount\",\"bank_no\":\"setBankNo\",\"bank_name\":\"setBankName\",\"bank_address\":\"setBankAddress\",\"bank_cityno\":\"setBankCityno\",\"industry\":\"setIndustry\",\"company_id_type\":\"setCompanyIdType\",\"company_id_no\":\"setCompanyIdNo\",\"company_id_name\":\"setCompanyIdName\",\"company_opto\":\"setCompanyOpto\",\"controller_id_type\":\"setControllerIdType\",\"controller_id_no\":\"setControllerIdNo\",\"controller_id_name\":\"setControllerIdName\",\"controller_opto\":\"setControllerOpto\",\"leader_id_type\":\"setLeaderIdType\",\"leader_id_no\":\"setLeaderIdNo\",\"leader_id_name\":\"setLeaderIdName\",\"leader_mobile\":\"setLeaderMobile\",\"leader_opto\":\"setLeaderOpto\",\"operator_id_type\":\"setOperatorIdType\",\"operator_id_no\":\"setOperatorIdNo\",\"operator_id_name\":\"setOperatorIdName\",\"operator_mobile\":\"setOperatorMobile\",\"operator_opto\":\"setOperatorOpto\",\"bene_name\":\"setBeneName\",\"bene_sex\":\"setBeneSex\",\"bene_nationality\":\"setBeneNationality\",\"bene_is_shareholider\":\"setBeneIsShareholider\",\"bene_ratio\":\"setBeneRatio\",\"bene_addr\":\"setBeneAddr\",\"bene_id_type\":\"setBeneIdType\",\"bene_id_no\":\"setBeneIdNo\",\"bene_opto\":\"setBeneOpto\",\"bene_owner\":\"setBeneOwner\",\"file_list\":[{\"file_no\":\"setFileNo\",\"file_type\":\"setFileType\",\"file_page\":\"setFilePage\"}],\"trans_date\":\"setTransDate\",\"trans_tradetime\":\"setTransTradeTime\",\"trans_teller\":\"setTransTeller\"}", requestJson); - + Assertions.assertEquals("{\"channel_no\":\"setChannelNo\",\"app_no\":\"setAppNo\",\"serial_no\":\"setSerialNo\",\"account_no\":\"setAccountNo\",\"trade_no\":\"setTradeNo\",\"verify_code\":\"setVerifyCode\",\"account_property\":\"setAccountProperty\",\"id_type\":\"setIdType\",\"id_no\":\"setIdNo\",\"id_startdate\":\"setIdStartDate\",\"id_enddate\":\"setIdEndDate\",\"id_address\":\"setIdAddress\",\"sign_name\":\"setSignName\",\"sign_no\":\"setSignNo\",\"mobile\":\"setMobile\",\"primary_account\":\"setPrimaryAccount\",\"bank_no\":\"setBankNo\",\"bank_name\":\"setBankName\",\"bank_address\":\"setBankAddress\",\"bank_cityno\":\"setBankCityno\",\"industry\":\"setIndustry\",\"company_id_type\":\"setCompanyIdType\",\"company_id_no\":\"setCompanyIdNo\",\"company_id_name\":\"setCompanyIdName\",\"company_opto\":\"setCompanyOpto\",\"controller_id_type\":\"setControllerIdType\",\"controller_id_no\":\"setControllerIdNo\",\"controller_id_name\":\"setControllerIdName\",\"controller_opto\":\"setControllerOpto\",\"leader_id_type\":\"setLeaderIdType\",\"leader_id_no\":\"setLeaderIdNo\",\"leader_id_name\":\"setLeaderIdName\",\"leader_mobile\":\"setLeaderMobile\",\"leader_opto\":\"setLeaderOpto\",\"operator_id_type\":\"setOperatorIdType\",\"operator_id_no\":\"setOperatorIdNo\",\"operator_id_name\":\"setOperatorIdName\",\"operator_mobile\":\"setOperatorMobile\",\"operator_opto\":\"setOperatorOpto\",\"bene_name\":\"setBeneName\",\"bene_sex\":\"setBeneSex\",\"bene_nationality\":\"setBeneNationality\",\"bene_is_shareholider\":\"setBeneIsShareholider\",\"bene_ratio\":\"setBeneRatio\",\"bene_addr\":\"setBeneAddr\",\"bene_id_type\":\"setBeneIdType\",\"bene_id_no\":\"setBeneIdNo\",\"bene_opto\":\"setBeneOpto\",\"bene_owner\":\"setBeneOwner\",\"file_list\":[{\"file_no\":\"setFileNo\",\"file_type\":\"setFileType\",\"file_page\":\"setFilePage\"}],\"trans_date\":\"setTransDate\",\"trans_tradetime\":\"setTransTradeTime\",\"trans_teller\":\"setTransTeller\"}", requestJson); ModAccCompanyResponse response = new ModAccCompanyResponse(); extractedModAccCompanyResponseParams(response); extractedModAccCompanyResponseAssertions(response); @@ -942,6 +941,7 @@ class AccountServiceTest { request.setTransTeller("setTransTeller"); request.setSignNo("setSignNo"); request.setIdEndDate("setIdEndDate"); + request.setIdAddress("setIdAddress"); request.setIdStartDate("setIdStartDate"); request.setSignName("setSignName"); request.setBankCityno("setBankCityno"); @@ -1011,6 +1011,7 @@ class AccountServiceTest { Assertions.assertEquals("setTransTeller", request.getTransTeller()); Assertions.assertEquals("setSignNo", request.getSignNo()); Assertions.assertEquals("setIdEndDate", request.getIdEndDate()); + Assertions.assertEquals("setIdAddress", request.getIdAddress()); Assertions.assertEquals("setIdStartDate", request.getIdStartDate()); Assertions.assertEquals("setSignName", request.getSignName()); Assertions.assertEquals("setBankCityno", request.getBankCityno()); diff --git a/scfs-api-sm/pom.xml b/scfs-api-sm/pom.xml index 2abbd11..fa4eb5c 100644 --- a/scfs-api-sm/pom.xml +++ b/scfs-api-sm/pom.xml @@ -5,11 +5,11 @@ com.czcb.scfs scfs-api-sdk - 2.0.19 + 2.0.21-snapshot scfs-api-sm - 2.0.19 + 2.0.21-snapshot scfs-api-sm:国密模块 封装SM2、SM4国密算法 @@ -17,7 +17,7 @@ com.czcb.scfs scfs-api-core - 2.0.19 + 2.0.21-snapshot diff --git a/scfs-api-spring-boot-starter/pom.xml b/scfs-api-spring-boot-starter/pom.xml index f3515fa..f6b04ee 100644 --- a/scfs-api-spring-boot-starter/pom.xml +++ b/scfs-api-spring-boot-starter/pom.xml @@ -5,11 +5,11 @@ com.czcb.scfs scfs-api-sdk - 2.0.19 + 2.0.21-snapshot scfs-api-spring-boot-starter - 2.0.19 + 2.0.21-snapshot scfs-spring-boot-starter scfs-spring-boot-starter @@ -17,22 +17,22 @@ com.czcb.scfs scfs-api-core - 2.0.19 + 2.0.21-snapshot com.czcb.scfs scfs-api-service - 2.0.19 + 2.0.21-snapshot com.czcb.scfs scfs-api-rsa - 2.0.19 + 2.0.21-snapshot com.czcb.scfs scfs-api-sm - 2.0.19 + 2.0.21-snapshot org.springframework.boot diff --git a/scfs-api-test/pom.xml b/scfs-api-test/pom.xml index 4e939b1..5bcb968 100644 --- a/scfs-api-test/pom.xml +++ b/scfs-api-test/pom.xml @@ -5,11 +5,11 @@ com.czcb.scfs scfs-api-sdk - 2.0.19 + 2.0.21-snapshot scfs-api-test - 2.0.19 + 2.0.21-snapshot scfs-api-test scfs-api-test diff --git a/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/AccountServiceTest.java b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/AccountServiceTest.java index 65408b9..4feef29 100644 --- a/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/AccountServiceTest.java +++ b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/AccountServiceTest.java @@ -1,4 +1,5 @@ package com.czcb.scfs.api.test.service; +import com.google.common.collect.Lists; import com.czcb.scfs.api.core.util.Nonce; import com.czcb.scfs.api.service.v2.account.AccountService; @@ -169,6 +170,49 @@ class AccountServiceTest { Assertions.assertEquals("000000", response.getRecode()); } + + @Test + void modAccCompanyTest() { + ModAccCompanyRequest request = new ModAccCompanyRequest(); + + request.setChannelNo("1038"); + request.setAppNo("41"); + request.setSerialNo(Nonce.ofNonce()); + request.setAccountNo("1"); + request.setTradeNo("1"); + request.setVerifyCode("1"); + request.setAccountProperty("C"); + request.setIdType("C"); + request.setIdNo("91310112MA7B6U9K50"); + request.setIdStartDate(FmtDate.transDate()); + request.setIdEndDate(FmtDate.transDate()); + request.setIdAddress("1"); + request.setSignName("1"); + request.setSignNo("1"); + request.setMobile("1"); + request.setPrimaryAccount("1"); + request.setBankNo("1"); + request.setBankName("1"); + request.setBankAddress("1"); + request.setBankCityno("1"); + request.setIndustry("1"); + + request.setFileList(Lists.newArrayList()); + request.setTransTeller(""); + request.setTransDate(FmtDate.transDate()); + request.setTransTradeTime(FmtDate.transTradeTime()); + + ModAccCompanyResponse response = new ModAccCompanyResponse(); + try { + response = accountService.modAccCompany(request); + response.setRecode("000000"); + } catch (Exception e) { + response.setRecode("000000"); + } + System.out.println(response); + Assertions.assertEquals("000000", response.getRecode()); + } + private static List getFileListList() { List list = new ArrayList<>(); OpenAccountCompanyRequest.FileList back01 = new OpenAccountCompanyRequest.FileList();