Merge branch 'release/0.3.20'

0.3.11

pom.xml

@@ -6,18 +6,21 @@
 
     <groupId>com.tsl3060.open.extend</groupId>
     <artifactId>tsl-open-sdk-java-wanshun</artifactId>
-    <version>0.3.7</version>
+    <version>0.3.20</version>
 
-    <properties>
+    <properties> 
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <hutool.version>5.8.19</hutool.version>
         <!--        日志-->
-        <logback.version>1.4.7</logback.version>
+        <logback.version>1.4.14</logback.version>
     </properties>
 
+
+
     <dependencies>
 
         <dependency>
@@ -39,7 +42,7 @@
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcprov-jdk15to18</artifactId>
-            <version>1.69</version>
+            <version>1.74</version>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
@@ -50,7 +53,7 @@
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
-            <version>4.10.0</version>
+            <version>4.11.0</version>
         </dependency>
         <dependency>
             <groupId>com.alibaba.fastjson2</groupId>
@@ -77,6 +80,7 @@
     </dependencyManagement>
 
     <build>
+
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -111,6 +115,53 @@
 <!--                    </execution>-->
 <!--                </executions>-->
 <!--            </plugin>-->
+
+
+            <plugin>
+                <!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-antrun-plugin -->
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-antrun-plugin</artifactId>
+                    <version>3.1.0</version>
+                <executions>
+                    <execution>
+                        <id>run</id>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <phase>generate-sources</phase>
+                        <configuration>
+                            <target>
+                                <property name="src.dir" value="${project.build.sourceDirectory}" />
+                                <property name="package.dir" value="com/tsl3060/open/extend/core/constant" />
+                                <property name="package.name" value="com.tsl3060.open.extend.core.constant" />
+                                <property name="project.version" value="${project.version}" />
+
+                                <echo file="${src.dir}/${package.dir}/BuildInfo.java" message="package ${package.name};${line.separator}" />
+                                <echo file="${src.dir}/${package.dir}/BuildInfo.java" append="true" message="public final class BuildInfo {${line.separator}" />
+                                <echo file="${src.dir}/${package.dir}/BuildInfo.java" append="true"
+                                      message="/** SDK Version */${line.separator}public static String VERSION=&quot;${project.version}&quot;;${line.separator}" />
+                                <echo file="${src.dir}/${package.dir}/BuildInfo.java" append="true" message="}${line.separator}" />
+                                <echo message="BUILD OK" />
+                            </target>
+                        </configuration>
+                    </execution>
+                </executions>
+
+            </plugin>
+
         </plugins>
     </build>
+
+    <distributionManagement>
+        <repository>
+            <id>tansilu-release</id>
+            <name>TanSiLu-release</name>
+            <url>http://192.168.10.211:8081/repository/maven-releases/</url>
+        </repository>
+        <snapshotRepository>
+            <id>tansilu-snapshots</id>
+            <name>TanSiLu-snapshots</name>
+            <url>http://192.168.10.211:8081/repository/maven-snapshots/</url>
+        </snapshotRepository>
+    </distributionManagement>
 </project>

src/main/java/com/tsl3060/open/extend/core/ApiClient.java

@@ -6,7 +6,8 @@ import cn.hutool.core.util.XmlUtil;
 import cn.hutool.log.Log;
 import cn.hutool.log.LogFactory;
 import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.JSONObject;
+import com.alibaba.fastjson2.JSONWriter;
+import com.tsl3060.open.extend.core.constant.BuildInfo;
 import com.tsl3060.open.extend.core.exception.ApiException;
 import com.tsl3060.open.extend.core.exception.BadResourceException;
 import com.tsl3060.open.extend.core.notify.IAnswer;
@@ -21,9 +22,9 @@ import java.io.IOException;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.concurrent.TimeUnit;
 
 public class ApiClient {
-
     private static final int ERROR_OK = 1000;
 
     private static final int SUB_OK = 2000;
@@ -46,6 +47,11 @@ public class ApiClient {
 
     private final Log log = LogFactory.get();
 
+    public ApiClient() {
+        //输出版本
+        log.debug("SDK VERSION : {}", BuildInfo.VERSION);
+    }
+
     private SecureTool getSecureTool() {
         if (secureTool == null) {
             secureTool = new SecureTool(getConfig());
@@ -126,24 +132,29 @@ public class ApiClient {
         ISecure iSecure = getSecureTool().getSecure(apiRequest.getSignType());
         String signStr = iSecure.requestSign(apiRequest);
         apiRequest.setSign(signStr);
-        String fBody = JSON.toJSONString(apiRequest);
-        log.debug(">>> {}", fBody);
-        RequestBody requestBody = RequestBody.create(fBody, contentType);
-        /**
-         * 通讯主机地址
-         */
+        String fBody = JSON.toJSONString(apiRequest, JSONWriter.Feature.WriteNullStringAsEmpty, JSONWriter.Feature.WriteNullListAsEmpty);
 
+        RequestBody requestBody = RequestBody.create(fBody, contentType);
+        //通讯主机地址
         String host = this.config.getHost();
+        String url = String.format("%s%s", host, apiRequest.getPath());
+
         Request request = new Request.Builder()
-                .url(String.format("%s%s", host, apiRequest.getPath()))
-                .addHeader("ACCEPT", acceptType.toString())
+                .url(url)
+                .addHeader("ACCEPT", acceptType != null ? acceptType.toString() : "application/json")
                 .post(requestBody)
                 .build();
         OkHttpClient.Builder builder = new OkHttpClient.Builder();
+        //设置连接超时时间
+        builder.connectTimeout(this.config.getTimeout(), TimeUnit.MILLISECONDS);
         OkHttpClient okHttpClient = builder.build();
+        log.debug(">>> {} {}", url, fBody);
         try {
             Call call = okHttpClient.newCall(request);
             try (Response response = call.execute()) {
+                if (!response.isSuccessful()) {
+                    throw new RuntimeException(String.format("接口请求执行未成功(%d)", response.code()));
+                }
                 ResponseBody responseBody = response.body();
                 ApiResponse apiResponse = null;
                 if (responseBody != null) {
@@ -152,19 +163,20 @@ public class ApiClient {
                     apiResponse = JSON.parseObject(bStr, ApiResponse.class);
                 }
                 if (apiResponse == null) {
-                    return null;
+                    throw new RuntimeException("反馈信息解析失败");
                 }
                 //验证签名
                 if (this.verifyResponse(apiResponse)) {
                     return apiResponse;
+                } else {
+                    throw new RuntimeException("反馈数据验签失败，请检查私钥是否正确");
                 }
-                return null;
 
             }
         } catch (IOException e) {
             log.error(e);
+            throw new RuntimeException("接口请求过程中遇到错误");
         }
-        return null;
     }
 
     /**
@@ -176,7 +188,7 @@ public class ApiClient {
     public boolean verifyResponse(ApiResponse response) {
         ISecure iSecure = this.secureTool.getSecure(response.getSignType());
         if (iSecure == null) {
-            log.debug("没有找到签名类型 %s", response.getSignType());
+            log.debug("没有找到签名类型 {}", response.getSignType());
             return false;
         }
         return iSecure.verifyResponse(response);
@@ -196,30 +208,19 @@ public class ApiClient {
 
     private NotifyMapRouter notifyMapRouter;
 
+
     /**
      * 验证回调数据
      *
-     * @return
+     * @param notifyRequest 回调请求
+     * @param accept        回调接收的类型
+     * @return 返回Body
+     * @throws BadResourceException
      */
-    public String notifyRun(String raw, String contentType, String accept) throws BadResourceException {
+    public String notifyRun(NotifyRequest notifyRequest, String accept) throws BadResourceException {
         if (notifyMapRouter == null) {
             notifyMapRouter = new NotifyMapRouter(this.notifyListener);
         }
-        if (StrUtil.isEmpty(raw)) {
-            throw new BadResourceException("通知内容为空");
-        }
-
-        NotifyRequest notifyRequest;
-        if (contentType.contains("application/json")) {
-            notifyRequest = JSON.parseObject(raw, NotifyRequest.class);
-        } else if (contentType.contains("application/xml")) {
-            //XML格式
-            Document document = XmlUtil.parseXml(raw);
-            //TODO 对XML解析
-            throw new BadResourceException("暂不支持的格式");
-        } else {
-            throw new BadResourceException("不支持的数据格式");
-        }
         //验证通知
         ISecure iSecure = getSecureTool().getSecure(notifyRequest.getSignType());
         if (!iSecure.verifyNotify(notifyRequest)) {
@@ -252,7 +253,6 @@ public class ApiClient {
         notifyAnswerResponse.setSign(signStr);
         //解析完成
         if (accept.contains("application/json")) {
-
             return JSON.toJSONString(notifyAnswerResponse);
         } else if (accept.contains("application/xml")) {
             //返回XML格式
@@ -262,4 +262,32 @@ public class ApiClient {
             return "";
         }
     }
+
+    /**
+     * 验证回调数据
+     *
+     * @return
+     */
+    public String notifyRun(String raw, String contentType, String accept) throws BadResourceException {
+        if (notifyMapRouter == null) {
+            notifyMapRouter = new NotifyMapRouter(this.notifyListener);
+        }
+        if (StrUtil.isEmpty(raw)) {
+            throw new BadResourceException("通知内容为空");
+        }
+
+        NotifyRequest notifyRequest;
+        if (contentType.contains("application/json")) {
+            notifyRequest = JSON.parseObject(raw, NotifyRequest.class);
+        } else if (contentType.contains("application/xml")) {
+            //XML格式
+            Document document = XmlUtil.parseXml(raw);
+            //TODO 对XML解析
+            throw new BadResourceException("暂不支持的格式");
+        } else {
+            throw new BadResourceException("不支持的数据格式");
+        }
+
+        return notifyRun(notifyRequest, accept);
+    }
 }

src/main/java/com/tsl3060/open/extend/core/Config.java

@@ -19,6 +19,15 @@ public class Config {
     private String host = "https://open.tsl3060.com";
     private String dataFormat = "yyyy-MM-dd HH:mm:ss";
 
+    private int timeout = 25000;
+
+    public int getTimeout() {
+        return timeout;
+    }
+
+    public void setTimeout(int timeout) {
+        this.timeout = timeout;
+    }
 
     public String getPrivateKey() {
         return privateKey;

src/main/java/com/tsl3060/open/extend/core/INotifyListener.java

@@ -1,7 +1,6 @@
 package com.tsl3060.open.extend.core;
 
-import com.tsl3060.open.extend.core.notify.CarbonOrderNotify;
-import com.tsl3060.open.extend.core.notify.CarbonOrderNotifyAnswer;
+import com.tsl3060.open.extend.core.notify.*;
 
 public interface INotifyListener {
     /**
@@ -9,6 +8,24 @@ public interface INotifyListener {
      *
      * @param notify
      * @return
+     * @deprecated 后续不再通过订单通知低碳积分变更，请使用低碳积分变更通知接口
      */
+    @Deprecated
     CarbonOrderNotifyAnswer carbon(CarbonOrderNotify notify);
+
+    /**
+     * 低碳积分变更通知
+     *
+     * @param notify 变更通知
+     * @return 变更响应
+     */
+    CarbonValueNotifyAnswer carbonUpdate(CarbonValueNotify notify);
+
+    /**
+     * 绿色值变动通知
+     *
+     * @param notify 变动通知
+     * @return 接收结果
+     */
+    CarbonIntegralNotifyAnswer integral(CarbonIntegralNotify notify);
 }

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

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

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

@@ -0,0 +1,18 @@
+package com.tsl3060.open.extend.core.constant;
+
+public class TypeDefine {
+    /**
+     * 低碳值
+     */
+    public static final String TYPE_CARBON = "carbon";
+
+    /**
+     * 绿色值
+     */
+    public static final String TYPE_INTEGRAL = "integral";
+
+    /**
+     * 科目
+     */
+    public static final String TYPE_SUBJECT = "subject";
+}

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

@@ -0,0 +1,167 @@
+package com.tsl3060.open.extend.core.notify;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+
+public class CarbonIntegralNotify {
+    private String openid;
+    /**
+     * 绿色积分订单号
+     */
+    @JSONField(name = "order_no")
+    private String orderNo;
+
+    @JSONField(name = "serial_no")
+    private String serialNo;
+    /**
+     * 类型id
+     */
+    @JSONField(name = "type_id")
+    private String typeId;
+    /**
+     * 类型名称
+     */
+    @JSONField(name = "type_name")
+    private String typeName;
+    /**
+     * 绿色积分变动数量(整形，单位：0.01)
+     */
+    private String value;
+    /**
+     * 变动后余额（整形，单位0.01)
+     */
+    private String balance;
+
+    @JSONField(name = "pre_balance")
+    private String preBalance;
+    /**
+     * 发生时间，格式：yyyy-MM-dd HH:mm:ss
+     */
+    private String time;
+    /**
+     * 备注信息
+     */
+    private String fettle;
+    /**
+     * 变更科目
+     */
+    private String subject;
+    /**
+     * 说明
+     */
+    private String description;
+
+    public String getSubject() {
+        return subject;
+    }
+
+    public void setSubject(String subject) {
+        this.subject = subject;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getOpenid() {
+        return openid;
+    }
+
+    public void setOpenid(String openid) {
+        this.openid = openid;
+    }
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    public String getTypeId() {
+        return typeId;
+    }
+
+    public void setTypeId(String typeId) {
+        this.typeId = typeId;
+    }
+
+    public String getTypeName() {
+        return typeName;
+    }
+
+    public void setTypeName(String typeName) {
+        this.typeName = typeName;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public String getBalance() {
+        return balance;
+    }
+
+    public void setBalance(String balance) {
+        this.balance = balance;
+    }
+
+    public String getTime() {
+        return time;
+    }
+
+    public void setTime(String time) {
+        this.time = time;
+    }
+
+    public String getFettle() {
+        return fettle;
+    }
+
+    public void setFettle(String fettle) {
+        this.fettle = fettle;
+    }
+
+
+    public String getSerialNo() {
+        return serialNo;
+    }
+
+    public void setSerialNo(String serialNo) {
+        this.serialNo = serialNo;
+    }
+
+    public String getPreBalance() {
+        return preBalance;
+    }
+
+    public void setPreBalance(String preBalance) {
+        this.preBalance = preBalance;
+    }
+
+    @Override
+    public String toString() {
+        return "CarbonIntegralNotify{" +
+                "openid='" + openid + '\'' +
+                ", orderNo='" + orderNo + '\'' +
+                ", serialNo='" + serialNo + '\'' +
+                ", typeId='" + typeId + '\'' +
+                ", typeName='" + typeName + '\'' +
+                ", value='" + value + '\'' +
+                ", balance='" + balance + '\'' +
+                ", preBalance='" + preBalance + '\'' +
+                ", time='" + time + '\'' +
+                ", fettle='" + fettle + '\'' +
+                ", subject='" + subject + '\'' +
+                ", description='" + description + '\'' +
+                '}';
+    }
+}

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

@@ -0,0 +1,28 @@
+package com.tsl3060.open.extend.core.notify;
+
+
+/**
+ * 绿色积分通知应答
+ */
+public class CarbonIntegralNotifyAnswer implements IAnswer {
+
+    /**
+     * 是否应答成功
+     */
+    private boolean answer;
+
+    public CarbonIntegralNotifyAnswer(boolean answer) {
+        this.answer = answer;
+    }
+
+    public CarbonIntegralNotifyAnswer() {
+    }
+
+    public boolean isAnswer() {
+        return answer;
+    }
+
+    public void setAnswer(boolean answer) {
+        this.answer = answer;
+    }
+}

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

@@ -3,6 +3,7 @@ package com.tsl3060.open.extend.core.notify;
 import com.alibaba.fastjson2.annotation.JSONField;
 
 public class CarbonOrderNotify {
+
     /**
      * 用户OpenID
      */
@@ -22,13 +23,18 @@ public class CarbonOrderNotify {
      * 用户低碳积分
      */
     @JSONField(name = "carbon")
-    private double carbon;
+    private int carbon;
 
+    @JSONField(name = "carbon_value")
+    private String carbonValue;
     /**
      * 本次订单新增积分
      */
     @JSONField(name = "amount")
-    private double amount;
+    private int amount;
+
+    @JSONField(name = "amount_value")
+    private String amountValue;
     /**
      * 订单时间
      */
@@ -68,19 +74,51 @@ public class CarbonOrderNotify {
         this.carbonNo = carbonNo;
     }
 
-    public double getCarbon() {
+    /**
+     * 获取用户的低碳值
+     * <p>
+     * 该函数会丢失精度，使用 getCarbonValue 代理
+     *
+     * @return
+     */
+    @Deprecated
+    public int getCarbon() {
         return carbon;
     }
 
-    public void setCarbon(double carbon) {
+    /**
+     * 设置用户的低碳值
+     * <p>
+     * 该函数会丢失精度，使用 setCarbonValue 代替
+     *
+     * @param carbon
+     */
+    @Deprecated
+    public void setCarbon(int carbon) {
         this.carbon = carbon;
     }
 
-    public double getAmount() {
+    /**
+     * 获取本单低碳值
+     * <p>
+     * 该函数会丢失精度，使用 getAmountValue代替
+     *
+     * @return
+     */
+    @Deprecated
+    public int getAmount() {
         return amount;
     }
 
-    public void setAmount(double amount) {
+    /**
+     * 设置本单低碳值
+     * <p>
+     * 该函数会丢失精度，使用 setAmountValue代替
+     *
+     * @return
+     */
+    @Deprecated
+    public void setAmount(int amount) {
         this.amount = amount;
     }
 
@@ -107,4 +145,46 @@ 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;
+    }
+
+    @Override
+    public String toString() {
+        return "CarbonOrderNotify{" +
+                "openid='" + openid + '\'' +
+                ", orderNo='" + orderNo + '\'' +
+                ", carbonNo='" + carbonNo + '\'' +
+                ", carbon=" + carbon +
+                ", carbonValue='" + carbonValue + '\'' +
+                ", amount=" + amount +
+                ", amountValue='" + amountValue + '\'' +
+                ", orderTime='" + orderTime + '\'' +
+                ", completeTime='" + completeTime + '\'' +
+                ", type='" + type + '\'' +
+                '}';
+    }
 }

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

@@ -0,0 +1,162 @@
+package com.tsl3060.open.extend.core.notify;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+
+public class CarbonValueNotify {
+    private String openid;
+    @JSONField(name = "type_id")
+    private String typeId;
+    @JSONField(name = "type_name")
+    private String typeName;
+    /**
+     * 低碳值变动数量(整形，单位：0.01)
+     */
+    private String value;
+    /**
+     * 变动后余额（整形，单位0.01)
+     */
+    private String balance;
+
+
+    /**
+     * 变动前余额(整形，单位0.01)
+     */
+    @JSONField(name = "pre_balance")
+    private String preBalance;
+
+    /**
+     * 低碳值订单号
+     */
+    @JSONField(name = "order_no")
+    private String orderNo;
+
+    @JSONField(name = "serial_no")
+    private String serialNo;
+
+    private String time;
+
+    private String fettle;
+
+    /**
+     * 变更科目
+     */
+    private String subject;
+    /**
+     * 说明
+     */
+    private String description;
+
+    public String getSubject() {
+        return subject;
+    }
+
+    public void setSubject(String subject) {
+        this.subject = subject;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getOpenid() {
+        return openid;
+    }
+
+    public void setOpenid(String openid) {
+        this.openid = openid;
+    }
+
+    public String getTypeId() {
+        return typeId;
+    }
+
+    public void setTypeId(String typeId) {
+        this.typeId = typeId;
+    }
+
+    public String getTypeName() {
+        return typeName;
+    }
+
+    public void setTypeName(String typeName) {
+        this.typeName = typeName;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public String getBalance() {
+        return balance;
+    }
+
+    public void setBalance(String balance) {
+        this.balance = balance;
+    }
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    public String getTime() {
+        return time;
+    }
+
+    public void setTime(String time) {
+        this.time = time;
+    }
+
+    public String getFettle() {
+        return fettle;
+    }
+
+    public void setFettle(String fettle) {
+        this.fettle = fettle;
+    }
+
+    public String getPreBalance() {
+        return preBalance;
+    }
+
+    public void setPreBalance(String preBalance) {
+        this.preBalance = preBalance;
+    }
+
+    public String getSerialNo() {
+        return serialNo;
+    }
+
+    public void setSerialNo(String serialNo) {
+        this.serialNo = serialNo;
+    }
+
+    @Override
+    public String toString() {
+        return "CarbonValueNotify{" +
+                "openid='" + openid + '\'' +
+                ", typeId='" + typeId + '\'' +
+                ", typeName='" + typeName + '\'' +
+                ", value='" + value + '\'' +
+                ", balance='" + balance + '\'' +
+                ", preBalance='" + preBalance + '\'' +
+                ", orderNo='" + orderNo + '\'' +
+                ", carbonNo='" + serialNo + '\'' +
+                ", time='" + time + '\'' +
+                ", fettle='" + fettle + '\'' +
+                ", subject='" + subject + '\'' +
+                ", description='" + description + '\'' +
+                '}';
+    }
+}

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

@@ -0,0 +1,20 @@
+package com.tsl3060.open.extend.core.notify;
+
+public class CarbonValueNotifyAnswer implements IAnswer{
+    public CarbonValueNotifyAnswer(boolean answer) {
+        this.answer = answer;
+    }
+
+    public CarbonValueNotifyAnswer() {
+    }
+
+    private boolean answer;
+
+    public boolean isAnswer() {
+        return answer;
+    }
+
+    public void setAnswer(boolean answer) {
+        this.answer = answer;
+    }
+}

src/main/java/com/tsl3060/open/extend/core/payload/CarbonOrderPayload.java

@@ -13,7 +13,7 @@ public class CarbonOrderPayload extends RequestPayload implements IApiRequest {
     @JSONField(name = "order_no")
     private String orderNo;
 
-    private double mileage;
+    private String mileage;
     @JSONField(name = "order_time")
     private String orderTime;
     @JSONField(name = "order_state")
@@ -26,7 +26,7 @@ public class CarbonOrderPayload extends RequestPayload implements IApiRequest {
     private String completeTime = "";
 
     @JSONField(name = "order_pay")
-    private double orderPay = 0;
+    private String orderPay;
     private String behavior = "";
 
 
@@ -46,13 +46,6 @@ public class CarbonOrderPayload extends RequestPayload implements IApiRequest {
         this.orderNo = orderNo;
     }
 
-    public double getMileage() {
-        return mileage;
-    }
-
-    public void setMileage(double mileage) {
-        this.mileage = mileage;
-    }
 
     public String getOrderTime() {
         return orderTime;
@@ -95,14 +88,51 @@ public class CarbonOrderPayload extends RequestPayload implements IApiRequest {
         this.completeTime = completeTime;
     }
 
-    public double getOrderPay() {
+    public String getMileage() {
+        return mileage;
+    }
+
+
+    public void setMileage(double mileage) {
+        double v = mileage * 1000;
+        this.setMileage(String.valueOf((int) v));
+    }
+
+    private void setMileage(String mileage) {
+        this.mileage = mileage;
+    }
+
+    /**
+     * 里程 (单位：m)
+     *
+     * @param mileage
+     */
+    public void setMileage(int mileage) {
+        this.setMileage(String.valueOf(mileage));
+    }
+
+    public String getOrderPay() {
         return orderPay;
     }
 
     public void setOrderPay(double orderPay) {
+        double v = orderPay * 100;
+        this.setOrderPay(String.valueOf((int) v));
+    }
+
+    private void setOrderPay(String orderPay) {
         this.orderPay = orderPay;
     }
 
+    /**
+     * 订单金额 (单位：分)
+     *
+     * @param orderPay
+     */
+    public void setOrderPay(int orderPay) {
+        this.setOrderPay(String.valueOf(orderPay));
+    }
+
     public String getBehavior() {
         return behavior;
     }

src/main/java/com/tsl3060/open/extend/core/payload/DicQueryPayload.java

@@ -0,0 +1,22 @@
+package com.tsl3060.open.extend.core.payload;
+
+import com.tsl3060.open.extend.core.IApiRequest;
+
+public class DicQueryPayload extends RequestPayload implements IApiRequest {
+    @Override
+    public String path() {
+        return "/v1/wanshun/dic/query";
+    }
+
+
+    private String type;
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+}

src/main/java/com/tsl3060/open/extend/core/payload/UserRelationPayload.java

@@ -0,0 +1,41 @@
+package com.tsl3060.open.extend.core.payload;
+
+import com.tsl3060.open.extend.core.IApiRequest;
+
+import java.util.List;
+
+public class UserRelationPayload extends RequestPayload implements IApiRequest {
+    @Override
+    public String path() {
+        return "/v1/wanshun/user/relation";
+    }
+
+    private String openid;
+    private String parentId;
+    private List<String> children;
+
+
+    public String getOpenid() {
+        return openid;
+    }
+
+    public void setOpenid(String openid) {
+        this.openid = openid;
+    }
+
+    public String getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(String parentId) {
+        this.parentId = parentId;
+    }
+
+    public List<String> getChildren() {
+        return children;
+    }
+
+    public void setChildren(List<String> children) {
+        this.children = children;
+    }
+}

src/main/java/com/tsl3060/open/extend/core/response/CarbonOrderResponse.java

@@ -4,8 +4,8 @@ import com.alibaba.fastjson2.annotation.JSONField;
 
 public class CarbonOrderResponse {
     private String openid;
-    private String carbon;
-    private double total;
+    private int carbon;
+    private int total;
     private String record;
     @JSONField(name = "record_time")
     private String recordTime;
@@ -18,19 +18,19 @@ public class CarbonOrderResponse {
         this.openid = openid;
     }
 
-    public String getCarbon() {
+    public int getCarbon() {
         return carbon;
     }
 
-    public void setCarbon(String carbon) {
+    public void setCarbon(int carbon) {
         this.carbon = carbon;
     }
 
-    public double getTotal() {
+    public int getTotal() {
         return total;
     }
 
-    public void setTotal(double total) {
+    public void setTotal(int total) {
         this.total = total;
     }
 

src/main/java/com/tsl3060/open/extend/core/response/DicQueryResponse.java

@@ -0,0 +1,47 @@
+package com.tsl3060.open.extend.core.response;
+
+import java.util.List;
+
+public class DicQueryResponse {
+
+    private boolean result;
+    private List<Dic> dic;
+
+    public boolean isResult() {
+        return result;
+    }
+
+    public void setResult(boolean result) {
+        this.result = result;
+    }
+
+    public List<Dic> getDic() {
+        return dic;
+    }
+
+    public void setDic(List<Dic> dic) {
+        this.dic = dic;
+    }
+
+    public static class Dic {
+        private String key;
+        private String name;
+
+
+        public String getKey() {
+            return key;
+        }
+
+        public void setKey(String key) {
+            this.key = key;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+    }
+}

src/main/java/com/tsl3060/open/extend/core/response/UserRelationResponse.java

@@ -0,0 +1,13 @@
+package com.tsl3060.open.extend.core.response;
+
+public class UserRelationResponse {
+    private boolean result;
+
+    public boolean isResult() {
+        return result;
+    }
+
+    public void setResult(boolean result) {
+        this.result = result;
+    }
+}

src/main/java/com/tsl3060/open/extend/core/router/notify/CarbonIntegralNotifyRouter.java

@@ -0,0 +1,29 @@
+package com.tsl3060.open.extend.core.router.notify;
+
+import com.alibaba.fastjson2.JSON;
+import com.tsl3060.open.extend.core.INotifyListener;
+import com.tsl3060.open.extend.core.NotifyRequest;
+import com.tsl3060.open.extend.core.notify.CarbonIntegralNotify;
+import com.tsl3060.open.extend.core.notify.IAnswer;
+import com.tsl3060.open.extend.core.router.INotifyRouter;
+
+public class CarbonIntegralNotifyRouter implements INotifyRouter {
+    private final INotifyListener notifyListener;
+
+    public CarbonIntegralNotifyRouter(INotifyListener notifyListener) {
+        this.notifyListener = notifyListener;
+    }
+
+    @Override
+    public String path() {
+        return "/v1/wanshun/notify/integral";
+    }
+
+    @Override
+    public IAnswer makeBody(NotifyRequest notifyRequest) throws Exception {
+
+        CarbonIntegralNotify carbonIntegralNotify = JSON.to(CarbonIntegralNotify.class, notifyRequest.getPayload());
+
+        return this.notifyListener.integral(carbonIntegralNotify);
+    }
+}

src/main/java/com/tsl3060/open/extend/core/router/notify/CarbonValueNotifyRouter.java

@@ -0,0 +1,27 @@
+package com.tsl3060.open.extend.core.router.notify;
+
+import com.alibaba.fastjson2.JSON;
+import com.tsl3060.open.extend.core.INotifyListener;
+import com.tsl3060.open.extend.core.NotifyRequest;
+import com.tsl3060.open.extend.core.notify.CarbonValueNotify;
+import com.tsl3060.open.extend.core.notify.IAnswer;
+import com.tsl3060.open.extend.core.router.INotifyRouter;
+
+public class CarbonValueNotifyRouter implements INotifyRouter {
+    private final INotifyListener notifyListener;
+
+    public CarbonValueNotifyRouter(INotifyListener notifyListener) {
+        this.notifyListener = notifyListener;
+    }
+
+    @Override
+    public String path() {
+        return "/v1/wanshun/notify/carbonupdate";
+    }
+
+    @Override
+    public IAnswer makeBody(NotifyRequest notifyRequest) throws Exception {
+        CarbonValueNotify carbonValueNotify = JSON.to(CarbonValueNotify.class, notifyRequest.getPayload());
+        return this.notifyListener.carbonUpdate(carbonValueNotify);
+    }
+}

src/main/java/com/tsl3060/open/extend/core/secure/RSASecure.java

@@ -1,14 +1,13 @@
 package com.tsl3060.open.extend.core.secure;
 
-import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.HexUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.log.Log;
 import cn.hutool.log.LogFactory;
 import com.alibaba.fastjson2.JSONObject;
 import com.tsl3060.open.extend.core.*;
 
 import java.io.UnsupportedEncodingException;
-import java.math.BigDecimal;
 import java.nio.charset.Charset;
 import java.security.*;
 import java.security.spec.InvalidKeySpecException;
@@ -36,33 +35,53 @@ public class RSASecure implements ISecure {
     }
 
     private String object2LinkStr(Object ob) {
-        List<String> payloadStr = new ArrayList<>();
-        if (ob != null) {
-            JSONObject j = JSONObject.from(ob);
-            //排序
-            Set<String> _keys = j.keySet();
-            List<String> keys = _keys.stream().sorted(Comparator.naturalOrder()).collect(Collectors.toList());
-
-            for (String key : keys) {
-                if (j.get(key) != null) {
-                    Object v = j.get(key);
-                    String vx;
-                    if (v instanceof Double) {
-                        vx = String.format("%.2f", v);
-                    } else if (v instanceof Float) {
-                        vx = String.format("%.2f", v);
-                    } else if (v instanceof Boolean) {
-                        vx = String.format("%s", v);
-                    } else if (v instanceof BigDecimal) {
-                        vx = String.format("%.2f", v);
-                    } else {
-                        vx = String.valueOf(v);
+        if (ob == null) {
+            return "";
+        }
+        if (ob instanceof String) {
+            if (StrUtil.isEmpty(ob.toString())) {
+                return "";
+            }
+        }
+
+        JSONObject root = JSONObject.from(ob);
+        Set<String> _keys = root.keySet();
+        List<String> keys = new ArrayList<>(_keys);
+
+        List<String> keyValuePairs = new ArrayList<>();
+
+        keys.forEach(key -> {
+            Object valueNode = root.get(key);
+
+            String valueStr;
+            if (valueNode instanceof Number) {
+                valueStr = String.format("%s", valueNode);
+            } else if (valueNode instanceof Boolean) {
+                valueStr = String.format("%s", valueNode);
+            } else if (valueNode instanceof List) {
+                List<String> arrayValues = new ArrayList<>();
+                List<?> values = (List<?>) valueNode;
+                values.forEach(value -> {
+                    if (value instanceof String) {
+                        arrayValues.add(String.format("%s", value));
+                    }else{
+                        arrayValues.add(object2LinkStr(value));
                     }
-                    payloadStr.add(String.format("%s=%s", key, vx));
+                });
+
+                valueStr = String.join(",", arrayValues);
+            } else {
+                if(valueNode==null){
+                    valueNode="";
                 }
+                valueStr = String.format("%s", valueNode);
             }
-        }
-        return CollectionUtil.join(payloadStr, "&");
+            keyValuePairs.add(String.format("%s=%s",key,valueStr));
+        });
+        return keyValuePairs.stream()
+                .sorted()
+                .collect(Collectors.joining("&"));
+
     }
 
     public String sign(String content, String charset) {
@@ -110,7 +129,6 @@ public class RSASecure implements ISecure {
                 request.getTime(),
                 waitStr
         );
-        log.debug("req: {}", content);
 
         return this.sign(content, request.getCharset());