Merge branch 'release/0.3.20'

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.tsl3060.open.extend</groupId>
     <artifactId>tsl-open-sdk-java-wanshun</artifactId>
-    <version>0.3.19</version>
+    <version>0.3.20</version>
 
     <properties> 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -124,6 +124,7 @@
                     <version>3.1.0</version>
                 <executions>
                     <execution>
+                        <id>run</id>
                         <goals>
                             <goal>run</goal>
                         </goals>

src/main/java/com/tsl3060/open/extend/core/constant/BuildInfo.java

@@ -1,5 +1,5 @@
 package com.tsl3060.open.extend.core.constant;
 public final class BuildInfo {
 /** SDK Version */
-public static String VERSION="0.3.19";
+public static String VERSION="0.3.20";
 }

src/main/java/com/tsl3060/open/extend/core/notify/CarbonIntegralNotify.java

@@ -10,8 +10,8 @@ public class CarbonIntegralNotify {
     @JSONField(name = "order_no")
     private String orderNo;
 
-    @JSONField(name = "integral_no")
-    private String integralNo;
+    @JSONField(name = "serial_no")
+    private String serialNo;
     /**
      * 类型id
      */
@@ -130,12 +130,13 @@ public class CarbonIntegralNotify {
         this.fettle = fettle;
     }
 
-    public String getIntegralNo() {
-        return integralNo;
+
+    public String getSerialNo() {
+        return serialNo;
     }
 
-    public void setIntegralNo(String integralNo) {
-        this.integralNo = integralNo;
+    public void setSerialNo(String serialNo) {
+        this.serialNo = serialNo;
     }
 
     public String getPreBalance() {
@@ -151,7 +152,7 @@ public class CarbonIntegralNotify {
         return "CarbonIntegralNotify{" +
                 "openid='" + openid + '\'' +
                 ", orderNo='" + orderNo + '\'' +
-                ", integralNo='" + integralNo + '\'' +
+                ", serialNo='" + serialNo + '\'' +
                 ", typeId='" + typeId + '\'' +
                 ", typeName='" + typeName + '\'' +
                 ", value='" + value + '\'' +

src/main/java/com/tsl3060/open/extend/core/notify/CarbonValueNotify.java

@@ -30,8 +30,8 @@ public class CarbonValueNotify {
     @JSONField(name = "order_no")
     private String orderNo;
 
-    @JSONField(name = "carbon_no")
-    private String carbonNo;
+    @JSONField(name = "serial_no")
+    private String serialNo;
 
     private String time;
 
@@ -134,12 +134,12 @@ public class CarbonValueNotify {
         this.preBalance = preBalance;
     }
 
-    public String getCarbonNo() {
-        return carbonNo;
+    public String getSerialNo() {
+        return serialNo;
     }
 
-    public void setCarbonNo(String carbonNo) {
-        this.carbonNo = carbonNo;
+    public void setSerialNo(String serialNo) {
+        this.serialNo = serialNo;
     }
 
     @Override
@@ -152,7 +152,7 @@ public class CarbonValueNotify {
                 ", balance='" + balance + '\'' +
                 ", preBalance='" + preBalance + '\'' +
                 ", orderNo='" + orderNo + '\'' +
-                ", carbonNo='" + carbonNo + '\'' +
+                ", carbonNo='" + serialNo + '\'' +
                 ", time='" + time + '\'' +
                 ", fettle='" + fettle + '\'' +
                 ", subject='" + subject + '\'' +