Merge pull request '2.0.3' (#4) from dev into main

Reviewed-on: http://10.129.135.192:3000/scfs-workspace/scfs-api-sdk/pulls/4

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.czcb.scfs</groupId>
     <artifactId>scfs-api-sdk</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.3</version>
     <name>scfs-api-sdk</name>
     <description>scfs-api-sdk</description>
     <packaging>pom</packaging>
@@ -105,7 +105,7 @@
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-autoconfigure</artifactId>
-                <version>2.7.18</version>
+                <version>2.7.16</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

scfs-api-core/pom.xml

@@ -5,11 +5,11 @@
     <parent>
         <groupId>com.czcb.scfs</groupId>
         <artifactId>scfs-api-sdk</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.3</version>
     </parent>
 
     <artifactId>scfs-api-core</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.3</version>
     <name>scfs-api-core:核心模块</name>
     <description>scfs-api-core</description>
     <packaging>jar</packaging>

scfs-api-rsa/pom.xml

@@ -5,11 +5,11 @@
     <parent>
         <groupId>com.czcb.scfs</groupId>
         <artifactId>scfs-api-sdk</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.3</version>
     </parent>
 
     <artifactId>scfs-api-rsa</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.3</version>
     <name>scfs-api-rsa:RSA模块</name>
     <description>封装RSA、AES国密算法</description>
 
@@ -17,7 +17,7 @@
         <dependency>
             <groupId>com.czcb.scfs</groupId>
             <artifactId>scfs-api-core</artifactId>
-            <version>2.0.2</version>
+            <version>2.0.3</version>
         </dependency>
     </dependencies>
 

scfs-api-service-cat/pom.xml

@@ -5,11 +5,11 @@
     <parent>
         <groupId>com.czcb.scfs</groupId>
         <artifactId>scfs-api-sdk</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.3</version>
     </parent>
 
     <artifactId>scfs-api-service-cat</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.3</version>
     <name>scfs-api-service-cat:肥猫定制化接口</name>
     <description>肥猫SDK</description>
     <packaging>jar</packaging>
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>com.czcb.scfs</groupId>
             <artifactId>scfs-api-core</artifactId>
-            <version>2.0.2</version>
+            <version>2.0.3</version>
         </dependency>
     </dependencies>
 

scfs-api-service/pom.xml

@@ -5,11 +5,11 @@
     <parent>
         <groupId>com.czcb.scfs</groupId>
         <artifactId>scfs-api-sdk</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.3</version>
     </parent>
 
     <artifactId>scfs-api-service</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.3</version>
     <name>scfs-api-service:通用类接口</name>
     <description>通用类接口</description>
     <packaging>jar</packaging>
@@ -24,7 +24,7 @@
         <dependency>
             <groupId>com.czcb.scfs</groupId>
             <artifactId>scfs-api-core</artifactId>
-            <version>2.0.2</version>
+            <version>2.0.3</version>
         </dependency>
     </dependencies>
 </project>

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、全部核销）
          */

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")
+    @SerializedName("trans_date")
-    private String sysDate;
+    private String transDate;
 
     /**
      * 操作时间
      */
-    @SerializedName("sys_time")
+    @SerializedName("trans_tradetime")
-    private String sysTime;
+    private String transTradeTime;
 
     /**
      * 区划代码

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;

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、全部核销）
          */

scfs-api-sm/pom.xml

@@ -5,11 +5,11 @@
     <parent>
         <groupId>com.czcb.scfs</groupId>
         <artifactId>scfs-api-sdk</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.3</version>
     </parent>
 
     <artifactId>scfs-api-sm</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.3</version>
     <name>scfs-api-sm:国密模块</name>
     <description>封装SM2、SM4国密算法</description>
 
@@ -17,7 +17,7 @@
         <dependency>
             <groupId>com.czcb.scfs</groupId>
             <artifactId>scfs-api-core</artifactId>
-            <version>2.0.2</version>
+            <version>2.0.3</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/com.tencent.kona/kona-crypto -->

scfs-api-spring-boot-starter/pom.xml

@@ -5,11 +5,11 @@
     <parent>
         <groupId>com.czcb.scfs</groupId>
         <artifactId>scfs-api-sdk</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.3</version>
     </parent>
 
     <artifactId>scfs-api-spring-boot-starter</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.3</version>
     <name>scfs-spring-boot-starter</name>
     <description>scfs-spring-boot-starter</description>
 
@@ -17,22 +17,22 @@
         <dependency>
             <groupId>com.czcb.scfs</groupId>
             <artifactId>scfs-api-core</artifactId>
-            <version>${project.parent.version}</version>
+            <version>2.0.3</version>
         </dependency>
         <dependency>
             <groupId>com.czcb.scfs</groupId>
             <artifactId>scfs-api-service</artifactId>
-            <version>${project.parent.version}</version>
+            <version>2.0.3</version>
         </dependency>
         <dependency>
             <groupId>com.czcb.scfs</groupId>
             <artifactId>scfs-api-rsa</artifactId>
-            <version>${project.parent.version}</version>
+            <version>2.0.3</version>
         </dependency>
         <dependency>
             <groupId>com.czcb.scfs</groupId>
             <artifactId>scfs-api-sm</artifactId>
-            <version>${project.parent.version}</version>
+            <version>2.0.3</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

scfs-api-test/pom.xml

@@ -5,14 +5,19 @@
     <parent>
         <groupId>com.czcb.scfs</groupId>
         <artifactId>scfs-api-sdk</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.3</version>
     </parent>
 
     <artifactId>scfs-api-test</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.3</version>
     <name>scfs-api-test</name>
     <description>scfs-api-test</description>
 
+    <properties>
+        <sonar.skip>true</sonar.skip>
+        <maven.test.skip>true</maven.test.skip>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>com.czcb.scfs</groupId>
@@ -26,7 +31,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
-            <version>2.7.18</version>
+            <version>2.7.16</version>
         </dependency>
     </dependencies>
 

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.setTransDate("2024-03-20");
-        request.setSysDate("2024-03-20");
+        request.setTransTradeTime("2024-03-20");
         request.setZoningCode("110101001000000");
         FiveCascadeQueryResponse response = communalDataService.fiveCascadeQuery(request);