From 85812ac4afede67acd7410e918a2455f98b95cb8 Mon Sep 17 00:00:00 2001
From: nishengli <mothz@126.com>
Date: Tue, 19 Dec 2023 11:26:39 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8F=98=E5=8A=A8?=
 =?UTF-8?q?=E5=89=8D=E4=BD=99=E9=A2=9D;=E4=B8=9A=E5=8A=A1=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/notify/CarbonIntegralNotify.java     | 24 ++++++++++++++++
 .../extend/core/notify/CarbonValueNotify.java | 28 +++++++++++++++++++
 2 files changed, 52 insertions(+)

diff --git a/src/main/java/com/tsl3060/open/extend/core/notify/CarbonIntegralNotify.java b/src/main/java/com/tsl3060/open/extend/core/notify/CarbonIntegralNotify.java
index bd9a229..9a41ebc 100644
--- a/src/main/java/com/tsl3060/open/extend/core/notify/CarbonIntegralNotify.java
+++ b/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 + '\'' +
diff --git a/src/main/java/com/tsl3060/open/extend/core/notify/CarbonValueNotify.java b/src/main/java/com/tsl3060/open/extend/core/notify/CarbonValueNotify.java
index b430d1d..853d1f1 100644
--- a/src/main/java/com/tsl3060/open/extend/core/notify/CarbonValueNotify.java
+++ b/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 + '\'' +

From e4ca6e709f5efe9bfb62f64ccbd02d483cddf33c Mon Sep 17 00:00:00 2001
From: nishengli <mothz@126.com>
Date: Tue, 19 Dec 2023 11:28:44 +0800
Subject: [PATCH 2/2] 0.3.19

---
 pom.xml                                                         | 2 +-
 .../java/com/tsl3060/open/extend/core/constant/BuildInfo.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 37cf724..84517af 100644
--- a/pom.xml
+++ b/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>
diff --git a/src/main/java/com/tsl3060/open/extend/core/constant/BuildInfo.java b/src/main/java/com/tsl3060/open/extend/core/constant/BuildInfo.java
index 04be4b2..410d605 100644
--- a/src/main/java/com/tsl3060/open/extend/core/constant/BuildInfo.java
+++ b/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";
 }