From e08eaca7c3c589ae82d164c5bc36ff427b857bc5 Mon Sep 17 00:00:00 2001 From: 13009 Date: Thu, 30 May 2024 10:50:01 +0800 Subject: [PATCH 1/6] =?UTF-8?q?feat:=202.0.3-snapshot=20=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- scfs-api-core/pom.xml | 4 ++-- scfs-api-rsa/pom.xml | 6 +++--- scfs-api-service-cat/pom.xml | 6 +++--- scfs-api-service/pom.xml | 6 +++--- scfs-api-sm/pom.xml | 6 +++--- scfs-api-spring-boot-starter/pom.xml | 4 ++-- scfs-api-test/pom.xml | 4 ++-- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/pom.xml b/pom.xml index db55740..a1c20f9 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.czcb.scfs scfs-api-sdk - 2.0.2 + 2.0.3-snapshot scfs-api-sdk scfs-api-sdk pom diff --git a/scfs-api-core/pom.xml b/scfs-api-core/pom.xml index c3e89a2..ab16366 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.2 + 2.0.3-snapshot scfs-api-core - 2.0.2 + 2.0.3-snapshot scfs-api-core:核心模块 scfs-api-core jar diff --git a/scfs-api-rsa/pom.xml b/scfs-api-rsa/pom.xml index 34df985..283dee2 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.2 + 2.0.3-snapshot scfs-api-rsa - 2.0.2 + 2.0.3-snapshot scfs-api-rsa:RSA模块 封装RSA、AES国密算法 @@ -17,7 +17,7 @@ com.czcb.scfs scfs-api-core - 2.0.2 + 2.0.3-snapshot diff --git a/scfs-api-service-cat/pom.xml b/scfs-api-service-cat/pom.xml index f9c1c29..f324821 100644 --- a/scfs-api-service-cat/pom.xml +++ b/scfs-api-service-cat/pom.xml @@ -5,11 +5,11 @@ com.czcb.scfs scfs-api-sdk - 2.0.2 + 2.0.3-snapshot scfs-api-service-cat - 2.0.2 + 2.0.3-snapshot scfs-api-service-cat:肥猫定制化接口 肥猫SDK jar @@ -29,7 +29,7 @@ com.czcb.scfs scfs-api-core - 2.0.2 + 2.0.3-snapshot diff --git a/scfs-api-service/pom.xml b/scfs-api-service/pom.xml index c82870e..cb6fd3b 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.2 + 2.0.3-snapshot scfs-api-service - 2.0.2 + 2.0.3-snapshot scfs-api-service:通用类接口 通用类接口 jar @@ -24,7 +24,7 @@ com.czcb.scfs scfs-api-core - 2.0.2 + 2.0.3-snapshot diff --git a/scfs-api-sm/pom.xml b/scfs-api-sm/pom.xml index 23e537b..8967889 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.2 + 2.0.3-snapshot scfs-api-sm - 2.0.2 + 2.0.3-snapshot scfs-api-sm:国密模块 封装SM2、SM4国密算法 @@ -17,7 +17,7 @@ com.czcb.scfs scfs-api-core - 2.0.2 + 2.0.3-snapshot diff --git a/scfs-api-spring-boot-starter/pom.xml b/scfs-api-spring-boot-starter/pom.xml index 552edc4..03d596a 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.2 + 2.0.3-snapshot scfs-api-spring-boot-starter - 2.0.2 + 2.0.3-snapshot scfs-spring-boot-starter scfs-spring-boot-starter diff --git a/scfs-api-test/pom.xml b/scfs-api-test/pom.xml index cf40785..dc1d78a 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.2 + 2.0.3-snapshot scfs-api-test - 2.0.2 + 2.0.3-snapshot scfs-api-test scfs-api-test From 171bd3056294f2b1ff871a7574659e9be9d6619f Mon Sep 17 00:00:00 2001 From: wb2476 Date: Thu, 30 May 2024 11:28:56 +0800 Subject: [PATCH 2/6] =?UTF-8?q?feat:=E4=BA=94=E7=BA=A7=E5=8C=BA=E5=88=92?= =?UTF-8?q?=E7=9A=84=E5=9B=BA=E5=AE=9A=E8=AF=B7=E6=B1=82=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E7=9A=84=E7=B3=BB=E7=BB=9F=E6=97=A5=E6=9C=9F=E4=B8=8E=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E5=8F=98=E6=9B=B4=E4=B8=BA=E6=93=8D=E4=BD=9C=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E4=B8=8E=E6=97=B6=E9=97=B4=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v2/communal/model/FiveCascadeQueryRequest.java | 8 ++++---- .../v2/communal/model/FiveCascadeQueryResponse.java | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/communal/model/FiveCascadeQueryRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/communal/model/FiveCascadeQueryRequest.java index 5c55df1..9235e2d 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/communal/model/FiveCascadeQueryRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/communal/model/FiveCascadeQueryRequest.java @@ -34,14 +34,14 @@ public class FiveCascadeQueryRequest implements ApiRequest { /** * 操作日期 */ - @SerializedName("sys_date") - private String sysDate; + @SerializedName("trans_date") + private String transDate; /** * 操作时间 */ - @SerializedName("sys_time") - private String sysTime; + @SerializedName("trans_tradetime") + private String transTradeTime; /** * 区划代码 diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/communal/model/FiveCascadeQueryResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/communal/model/FiveCascadeQueryResponse.java index f50657c..7f6fb49 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/communal/model/FiveCascadeQueryResponse.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/communal/model/FiveCascadeQueryResponse.java @@ -33,13 +33,13 @@ public class FiveCascadeQueryResponse implements ApiResponse { private String sysSerialNo; /** - * 操作日期 + * 系统日期 */ @SerializedName("sys_date") private String sysDate; /** - * 操作时间 + * 系统时间 */ @SerializedName("sys_time") private String sysTime; From e90210ac79fdf140dd0acfc9d9406703bb86df2c Mon Sep 17 00:00:00 2001 From: wb1608 Date: Tue, 4 Jun 2024 15:49:36 +0800 Subject: [PATCH 3/6] =?UTF-8?q?feat:=E8=B4=B7=E6=AC=BE=E8=BF=98=E6=AC=BE?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=9F=A5=E8=AF=A2V2=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=B0=91=E5=AD=97=E6=AE=B5=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v1/loan/model/ApplyQueryV2Response.java | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/loan/model/ApplyQueryV2Response.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/loan/model/ApplyQueryV2Response.java index 7e4b263..40c2c33 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/loan/model/ApplyQueryV2Response.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/loan/model/ApplyQueryV2Response.java @@ -47,6 +47,56 @@ public class ApplyQueryV2Response implements ApiResponse { @Data public static class RecodeList implements Serializable { + /** + * 贷款类型 + */ + @SerializedName("loantp") + private String loantp; + /** + * 本月应还本金 + */ + @SerializedName("crnrpyblamtb") + private BigDecimal crnrpyblamtb; + /** + * 本月应还利息 + */ + @SerializedName("crnrpyblamtl") + private BigDecimal crnrpyblamtl; + /** + * 剩余本金 + */ + @SerializedName("rmanpnpamt") + private BigDecimal rmanpnpamt; + /** + * 还款日 + */ + @SerializedName("rpybldt") + private String rpybldt; + /** + * 合同编号 + */ + @SerializedName("ctrno") + private String ctrno; + /** + * 贷款账号 + */ + @SerializedName("loanacctno") + private String loanacctno; + /** + * 贷款账号序号 + */ + @SerializedName("acctseqno") + private String acctseqno; + /** + * 币种 + */ + @SerializedName("buyexgccycd") + private String buyexgccycd; + /** + * 年利率 + */ + @SerializedName("yrintrate") + private BigDecimal yrintrate; /** * 贷款状态（0、开户，1、正常，2、逾期，3、结清，4、销户，5、申报核销，6、部分核销，7、全部核销） */ From 52b0ac1fe846ef330ae204f7b2c9f66c25a8d375 Mon Sep 17 00:00:00 2001 From: wb1608 Date: Tue, 4 Jun 2024 16:16:24 +0800 Subject: [PATCH 4/6] =?UTF-8?q?feat:=E8=B4=B7=E6=AC=BE=E8=BF=98=E6=AC=BE?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=9F=A5=E8=AF=A2V2=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=B0=91=E5=AD=97=E6=AE=B5=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v2/loan/model/LoanRepayQueryResponse.java | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/loan/model/LoanRepayQueryResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/loan/model/LoanRepayQueryResponse.java index 41e9cfd..67b6d23 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/loan/model/LoanRepayQueryResponse.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/loan/model/LoanRepayQueryResponse.java @@ -53,6 +53,56 @@ public class LoanRepayQueryResponse implements ApiResponse { @Data public static class RecodeList implements Serializable { + /** + * 贷款类型 + */ + @SerializedName("loantp") + private String loantp; + /** + * 本月应还本金 + */ + @SerializedName("crnrpyblamtb") + private BigDecimal crnrpyblamtb; + /** + * 本月应还利息 + */ + @SerializedName("crnrpyblamtl") + private BigDecimal crnrpyblamtl; + /** + * 剩余本金 + */ + @SerializedName("rmanpnpamt") + private BigDecimal rmanpnpamt; + /** + * 还款日 + */ + @SerializedName("rpybldt") + private String rpybldt; + /** + * 合同编号 + */ + @SerializedName("ctrno") + private String ctrno; + /** + * 贷款账号 + */ + @SerializedName("loanacctno") + private String loanacctno; + /** + * 贷款账号序号 + */ + @SerializedName("acctseqno") + private String acctseqno; + /** + * 币种 + */ + @SerializedName("buyexgccycd") + private String buyexgccycd; + /** + * 年利率 + */ + @SerializedName("yrintrate") + private BigDecimal yrintrate; /** * 贷款状态（0、开户，1、正常，2、逾期，3、结清，4、销户，5、申报核销，6、部分核销，7、全部核销） */ From 3a9d514301ffdf5318558486f616c0a88aeeeac1 Mon Sep 17 00:00:00 2001 From: 13009 Date: Tue, 4 Jun 2024 16:21:54 +0800 Subject: [PATCH 5/6] =?UTF-8?q?fix:=20springboot=20=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7=E7=BB=9F=E4=B8=802.7.16?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- scfs-api-spring-boot-starter/pom.xml | 8 ++++---- scfs-api-test/pom.xml | 7 ++++++- .../com/czcb/scfs/api/test/CommunalDataServiceTest.java | 4 ++-- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index a1c20f9..d7789f7 100644 --- a/pom.xml +++ b/pom.xml @@ -105,7 +105,7 @@ org.springframework.boot spring-boot-autoconfigure - 2.7.18 + 2.7.16 diff --git a/scfs-api-spring-boot-starter/pom.xml b/scfs-api-spring-boot-starter/pom.xml index 03d596a..0b003f4 100644 --- a/scfs-api-spring-boot-starter/pom.xml +++ b/scfs-api-spring-boot-starter/pom.xml @@ -17,22 +17,22 @@ com.czcb.scfs scfs-api-core - ${project.parent.version} + 2.0.3-snapshot com.czcb.scfs scfs-api-service - ${project.parent.version} + 2.0.3-snapshot com.czcb.scfs scfs-api-rsa - ${project.parent.version} + 2.0.3-snapshot com.czcb.scfs scfs-api-sm - ${project.parent.version} + 2.0.3-snapshot org.springframework.boot diff --git a/scfs-api-test/pom.xml b/scfs-api-test/pom.xml index dc1d78a..6f7a613 100644 --- a/scfs-api-test/pom.xml +++ b/scfs-api-test/pom.xml @@ -13,6 +13,11 @@ scfs-api-test scfs-api-test + + true + true + + com.czcb.scfs @@ -26,7 +31,7 @@ org.springframework.boot spring-boot-starter-web - 2.7.18 + 2.7.16 diff --git a/scfs-api-test/src/test/java/com/czcb/scfs/api/test/CommunalDataServiceTest.java b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/CommunalDataServiceTest.java index 1660a1e..7bbd348 100644 --- a/scfs-api-test/src/test/java/com/czcb/scfs/api/test/CommunalDataServiceTest.java +++ b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/CommunalDataServiceTest.java @@ -25,8 +25,8 @@ public class CommunalDataServiceTest { request.setChannelNo("0000"); request.setAppNo("10"); request.setSerialNo(UUID.randomUUID().toString().replace("-", "")); - request.setSysTime("2024-03-20"); - request.setSysDate("2024-03-20"); + request.setTransDate("2024-03-20"); + request.setTransTradeTime("2024-03-20"); request.setZoningCode("110101001000000"); FiveCascadeQueryResponse response = communalDataService.fiveCascadeQuery(request); From 2512cef8cab6def0ac6ab6de41fde2d16bd92753 Mon Sep 17 00:00:00 2001 From: 13009 Date: Wed, 5 Jun 2024 09:20:20 +0800 Subject: [PATCH 6/6] feat: 2.0.3 --- pom.xml | 2 +- scfs-api-core/pom.xml | 4 ++-- scfs-api-rsa/pom.xml | 6 +++--- scfs-api-service-cat/pom.xml | 6 +++--- scfs-api-service/pom.xml | 6 +++--- scfs-api-sm/pom.xml | 6 +++--- scfs-api-spring-boot-starter/pom.xml | 12 ++++++------ scfs-api-test/pom.xml | 4 ++-- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/pom.xml b/pom.xml index d7789f7..03787cb 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.czcb.scfs scfs-api-sdk - 2.0.3-snapshot + 2.0.3 scfs-api-sdk scfs-api-sdk pom diff --git a/scfs-api-core/pom.xml b/scfs-api-core/pom.xml index ab16366..e00d733 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.3-snapshot + 2.0.3 scfs-api-core - 2.0.3-snapshot + 2.0.3 scfs-api-core:核心模块 scfs-api-core jar diff --git a/scfs-api-rsa/pom.xml b/scfs-api-rsa/pom.xml index 283dee2..f7850e0 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.3-snapshot + 2.0.3 scfs-api-rsa - 2.0.3-snapshot + 2.0.3 scfs-api-rsa:RSA模块 封装RSA、AES国密算法 @@ -17,7 +17,7 @@ com.czcb.scfs scfs-api-core - 2.0.3-snapshot + 2.0.3 diff --git a/scfs-api-service-cat/pom.xml b/scfs-api-service-cat/pom.xml index f324821..cafe0d6 100644 --- a/scfs-api-service-cat/pom.xml +++ b/scfs-api-service-cat/pom.xml @@ -5,11 +5,11 @@ com.czcb.scfs scfs-api-sdk - 2.0.3-snapshot + 2.0.3 scfs-api-service-cat - 2.0.3-snapshot + 2.0.3 scfs-api-service-cat:肥猫定制化接口 肥猫SDK jar @@ -29,7 +29,7 @@ com.czcb.scfs scfs-api-core - 2.0.3-snapshot + 2.0.3 diff --git a/scfs-api-service/pom.xml b/scfs-api-service/pom.xml index cb6fd3b..22b9d67 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.3-snapshot + 2.0.3 scfs-api-service - 2.0.3-snapshot + 2.0.3 scfs-api-service:通用类接口 通用类接口 jar @@ -24,7 +24,7 @@ com.czcb.scfs scfs-api-core - 2.0.3-snapshot + 2.0.3 diff --git a/scfs-api-sm/pom.xml b/scfs-api-sm/pom.xml index 8967889..38e2321 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.3-snapshot + 2.0.3 scfs-api-sm - 2.0.3-snapshot + 2.0.3 scfs-api-sm:国密模块 封装SM2、SM4国密算法 @@ -17,7 +17,7 @@ com.czcb.scfs scfs-api-core - 2.0.3-snapshot + 2.0.3 diff --git a/scfs-api-spring-boot-starter/pom.xml b/scfs-api-spring-boot-starter/pom.xml index 0b003f4..e3ca3d4 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.3-snapshot + 2.0.3 scfs-api-spring-boot-starter - 2.0.3-snapshot + 2.0.3 scfs-spring-boot-starter scfs-spring-boot-starter @@ -17,22 +17,22 @@ com.czcb.scfs scfs-api-core - 2.0.3-snapshot + 2.0.3 com.czcb.scfs scfs-api-service - 2.0.3-snapshot + 2.0.3 com.czcb.scfs scfs-api-rsa - 2.0.3-snapshot + 2.0.3 com.czcb.scfs scfs-api-sm - 2.0.3-snapshot + 2.0.3 org.springframework.boot diff --git a/scfs-api-test/pom.xml b/scfs-api-test/pom.xml index 6f7a613..709bd70 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.3-snapshot + 2.0.3 scfs-api-test - 2.0.3-snapshot + 2.0.3 scfs-api-test scfs-api-test