From 00975298cc53414de747e3f82b88d8a4d4e42c0b Mon Sep 17 00:00:00 2001
From: nishengli <mothz@126.com>
Date: Wed, 25 Oct 2023 16:09:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BE=93=E5=87=BA=E5=8F=AF?=
 =?UTF-8?q?=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../open/extend/core/constant/BuildInfo.java  |  2 +-
 .../extend/core/notify/CarbonOrderNotify.java | 75 ++++++++++++++-----
 2 files changed, 58 insertions(+), 19 deletions(-)

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 2a0adb5..b78e4d0 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.12";
+public static String VERSION="0.3.13";
 }
diff --git a/src/main/java/com/tsl3060/open/extend/core/notify/CarbonOrderNotify.java b/src/main/java/com/tsl3060/open/extend/core/notify/CarbonOrderNotify.java
index 7f3411d..a6f3d62 100644
--- a/src/main/java/com/tsl3060/open/extend/core/notify/CarbonOrderNotify.java
+++ b/src/main/java/com/tsl3060/open/extend/core/notify/CarbonOrderNotify.java
@@ -4,7 +4,6 @@ import com.alibaba.fastjson2.annotation.JSONField;
 
 public class CarbonOrderNotify {
 
-    private final double scale = 100.0;
     /**
      * 用户OpenID
      */
@@ -21,16 +20,21 @@ public class CarbonOrderNotify {
     private String carbonNo;
 
     /**
-     * 用户低碳积分 单位(0.01g)
+     * 用户低碳积分
      */
     @JSONField(name = "carbon")
     private int carbon;
 
+    @JSONField(name = "carbon_value")
+    private String carbonValue;
     /**
-     * 本次订单新增积分 单位(0.01g)
+     * 本次订单新增积分
      */
     @JSONField(name = "amount")
     private int amount;
+
+    @JSONField(name = "amount_value")
+    private String amountValue;
     /**
      * 订单时间
      */
@@ -71,40 +75,49 @@ public class CarbonOrderNotify {
     }
 
     /**
-     * 获取用户的低碳值，单位(0.01g)
+     * 获取用户的低碳值
+     * <p>
+     * 该函数会丢失精度，使用 getCarbonValue 代理
      *
      * @return
      */
+    @Deprecated
     public int getCarbon() {
         return carbon;
     }
 
     /**
-     * 获取用户的低碳值，单位(g)
-     *
-     * @return
-     */
-    public double getCarbonValue() {
-        return carbon / scale;
-    }
-
-    /**
-     * 设置用户的低碳值 ，单位 (0.01g)
+     * 设置用户的低碳值
+     * <p>
+     * 该函数会丢失精度，使用 setCarbonValue 代替
      *
      * @param carbon
      */
+    @Deprecated
     public void setCarbon(int carbon) {
         this.carbon = carbon;
     }
 
+    /**
+     * 获取本单低碳值
+     * <p>
+     * 该函数会丢失精度，使用 getAmountValue代替
+     *
+     * @return
+     */
+    @Deprecated
     public int getAmount() {
         return amount;
     }
 
-    public double getAmountValue() {
-        return amount / scale;
-    }
-
+    /**
+     * 设置本单低碳值
+     * <p>
+     * 该函数会丢失精度，使用 setAmountValue代替
+     *
+     * @return
+     */
+    @Deprecated
     public void setAmount(int amount) {
         this.amount = amount;
     }
@@ -132,4 +145,30 @@ public class CarbonOrderNotify {
     public void setType(String type) {
         this.type = type;
     }
+
+    public void setCarbonValue(String carbonValue) {
+        this.carbonValue = carbonValue;
+    }
+
+    public void setAmountValue(String amountValue) {
+        this.amountValue = amountValue;
+    }
+
+    /**
+     * 获取用户低碳值余额，格式: 0.## ,单位 g
+     *
+     * @return
+     */
+    public String getCarbonValue() {
+        return carbonValue;
+    }
+
+    /**
+     * 获取本订单低碳值，格式 0.##，单位g
+     *
+     * @return
+     */
+    public String getAmountValue() {
+        return amountValue;
+    }
 }