Merge branch 'release/0.3.19'

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.tsl3060.open.extend</groupId>
     <artifactId>tsl-open-sdk-java-wanshun</artifactId>
-    <version>0.3.18</version>
+    <version>0.3.19</version>
 
     <properties> 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

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.18";
+public static String VERSION="0.3.19";
 }

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

@@ -9,6 +9,9 @@ public class CarbonIntegralNotify {
      */
     @JSONField(name = "order_no")
     private String orderNo;
+
+    @JSONField(name = "integral_no")
+    private String integralNo;
     /**
      * 类型id
      */
@@ -27,6 +30,9 @@ public class CarbonIntegralNotify {
      * 变动后余额（整形，单位0.01)
      */
     private String balance;
+
+    @JSONField(name = "pre_balance")
+    private String preBalance;
     /**
      * 发生时间，格式：yyyy-MM-dd HH:mm:ss
      */
@@ -124,15 +130,33 @@ public class CarbonIntegralNotify {
         this.fettle = fettle;
     }
 
+    public String getIntegralNo() {
+        return integralNo;
+    }
+
+    public void setIntegralNo(String integralNo) {
+        this.integralNo = integralNo;
+    }
+
+    public String getPreBalance() {
+        return preBalance;
+    }
+
+    public void setPreBalance(String preBalance) {
+        this.preBalance = preBalance;
+    }
+
     @Override
     public String toString() {
         return "CarbonIntegralNotify{" +
                 "openid='" + openid + '\'' +
                 ", orderNo='" + orderNo + '\'' +
+                ", integralNo='" + integralNo + '\'' +
                 ", typeId='" + typeId + '\'' +
                 ", typeName='" + typeName + '\'' +
                 ", value='" + value + '\'' +
                 ", balance='" + balance + '\'' +
+                ", preBalance='" + preBalance + '\'' +
                 ", time='" + time + '\'' +
                 ", fettle='" + fettle + '\'' +
                 ", subject='" + subject + '\'' +

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

@@ -17,12 +17,22 @@ public class CarbonValueNotify {
      */
     private String balance;
 
+
+    /**
+     * 变动前余额(整形，单位0.01)
+     */
+    @JSONField(name = "pre_balance")
+    private String preBalance;
+
     /**
      * 低碳值订单号
      */
     @JSONField(name = "order_no")
     private String orderNo;
 
+    @JSONField(name = "carbon_no")
+    private String carbonNo;
+
     private String time;
 
     private String fettle;
@@ -116,6 +126,22 @@ public class CarbonValueNotify {
         this.fettle = fettle;
     }
 
+    public String getPreBalance() {
+        return preBalance;
+    }
+
+    public void setPreBalance(String preBalance) {
+        this.preBalance = preBalance;
+    }
+
+    public String getCarbonNo() {
+        return carbonNo;
+    }
+
+    public void setCarbonNo(String carbonNo) {
+        this.carbonNo = carbonNo;
+    }
+
     @Override
     public String toString() {
         return "CarbonValueNotify{" +
@@ -124,7 +150,9 @@ public class CarbonValueNotify {
                 ", typeName='" + typeName + '\'' +
                 ", value='" + value + '\'' +
                 ", balance='" + balance + '\'' +
+                ", preBalance='" + preBalance + '\'' +
                 ", orderNo='" + orderNo + '\'' +
+                ", carbonNo='" + carbonNo + '\'' +
                 ", time='" + time + '\'' +
                 ", fettle='" + fettle + '\'' +
                 ", subject='" + subject + '\'' +