Merge branch 'release/0.3.16'

pom.xml

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

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

@@ -1,5 +1,7 @@
 package com.tsl3060.open.extend.core;
 
+import com.tsl3060.open.extend.core.notify.CarbonIntegralNotify;
+import com.tsl3060.open.extend.core.notify.CarbonIntegralNotifyAnswer;
 import com.tsl3060.open.extend.core.notify.CarbonOrderNotify;
 import com.tsl3060.open.extend.core.notify.CarbonOrderNotifyAnswer;
 
@@ -11,4 +13,13 @@ public interface INotifyListener {
      * @return
      */
     CarbonOrderNotifyAnswer carbon(CarbonOrderNotify notify);
+
+
+    /**
+     * 绿色值变动通知
+     *
+     * @param notify 变动通知
+     * @return 接收结果
+     */
+    CarbonIntegralNotifyAnswer integral(CarbonIntegralNotify notify);
 }

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

@@ -0,0 +1,117 @@
+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;
+    /**
+     * 类型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;
+    /**
+     * 发生时间，格式：yyyy-MM-dd HH:mm:ss
+     */
+    private String time;
+    /**
+     * 备注信息
+     */
+    private String fettle;
+
+
+    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;
+    }
+
+    @Override
+    public String toString() {
+        return "CarbonIntegralNotify{" +
+                "openId='" + openid + '\'' +
+                ", orderNo='" + orderNo + '\'' +
+                ", typeId='" + typeId + '\'' +
+                ", typeName='" + typeName + '\'' +
+                ", value='" + value + '\'' +
+                ", balance='" + balance + '\'' +
+                ", time='" + time + '\'' +
+                ", fettle='" + fettle + '\'' +
+                '}';
+    }
+}

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

@@ -171,4 +171,20 @@ public class CarbonOrderNotify {
     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/router/notify/CarbonIntegralNotifyRouter.java

@@ -0,0 +1,30 @@
+package com.tsl3060.open.extend.core.router.notify;
+
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
+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);
+    }
+}