From 7fa98a417979f27ad1556eb365b9abd0138e1799 Mon Sep 17 00:00:00 2001
From: Guoqs <autumn.g@foxmail.com>
Date: Mon, 15 Apr 2024 14:01:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AF=B9=E8=B1=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../thirdparty/lianlian/service/impl/LianLianServiceImpl.java | 2 ++
 .../{lianlian/domain => platform/common}/ChargeDetail.java    | 3 ++-
 .../{lianlian/domain => platform/common}/OrderInfo.java       | 2 +-
 .../lianlian/service/LianLianPlatformServiceImpl.java         | 2 ++
 .../thirdparty/platform/neimenggu/domain/ChargeOrderInfo.java | 4 ++--
 .../neimenggu/service/NeiMengGuPlatformServiceImpl.java       | 2 ++
 6 files changed, 11 insertions(+), 4 deletions(-)
 rename jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/{lianlian/domain => platform/common}/ChargeDetail.java (95%)
 rename jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/{lianlian/domain => platform/common}/OrderInfo.java (98%)

diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java
index fe42b4828..8d782796b 100644
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java
@@ -41,6 +41,8 @@ import com.jsowell.thirdparty.common.CommonService;
 import com.jsowell.thirdparty.lianlian.domain.*;
 import com.jsowell.pile.thirdparty.CommonParamsDTO;
 import com.jsowell.thirdparty.lianlian.service.LianLianService;
+import com.jsowell.thirdparty.platform.common.ChargeDetail;
+import com.jsowell.thirdparty.platform.common.OrderInfo;
 import com.jsowell.thirdparty.platform.common.StationInfo;
 import com.jsowell.thirdparty.platform.util.Cryptos;
 import com.jsowell.thirdparty.platform.util.Encodes;
diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/ChargeDetail.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/common/ChargeDetail.java
similarity index 95%
rename from jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/ChargeDetail.java
rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/common/ChargeDetail.java
index c6e946921..a15da8b0c 100644
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/ChargeDetail.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/common/ChargeDetail.java
@@ -1,4 +1,4 @@
-package com.jsowell.thirdparty.lianlian.domain;
+package com.jsowell.thirdparty.platform.common;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.AllArgsConstructor;
@@ -10,6 +10,7 @@ import java.math.BigDecimal;
 
 /**
  * 充电明细信息体
+ * 内蒙古平台
  */
 @Builder
 @AllArgsConstructor
diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/OrderInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/common/OrderInfo.java
similarity index 98%
rename from jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/OrderInfo.java
rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/common/OrderInfo.java
index 4a8c94d3a..6d6855f5e 100644
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/OrderInfo.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/common/OrderInfo.java
@@ -1,4 +1,4 @@
-package com.jsowell.thirdparty.lianlian.domain;
+package com.jsowell.thirdparty.platform.common;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.AllArgsConstructor;
diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/lianlian/service/LianLianPlatformServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/lianlian/service/LianLianPlatformServiceImpl.java
index a8dbd4af8..271770028 100644
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/lianlian/service/LianLianPlatformServiceImpl.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/lianlian/service/LianLianPlatformServiceImpl.java
@@ -36,6 +36,8 @@ import com.jsowell.thirdparty.lianlian.domain.*;
 import com.jsowell.thirdparty.lianlian.vo.AccessTokenVO;
 import com.jsowell.thirdparty.lianlian.vo.EquipmentAuthVO;
 import com.jsowell.thirdparty.platform.ThirdPartyPlatformService;
+import com.jsowell.thirdparty.platform.common.ChargeDetail;
+import com.jsowell.thirdparty.platform.common.OrderInfo;
 import com.jsowell.thirdparty.platform.common.StationInfo;
 import com.jsowell.thirdparty.platform.util.Cryptos;
 import com.jsowell.thirdparty.platform.util.Encodes;
diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/neimenggu/domain/ChargeOrderInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/neimenggu/domain/ChargeOrderInfo.java
index 20dad39b0..e46342878 100644
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/neimenggu/domain/ChargeOrderInfo.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/neimenggu/domain/ChargeOrderInfo.java
@@ -250,7 +250,7 @@ public class ChargeOrderInfo {
      * ≤4字符
      */
     @JSONField(name = "StopReason")
-    private String stopReason;
+    private Integer stopReason;
 
     /**
      * 充电结束原因描述
@@ -272,7 +272,7 @@ public class ChargeOrderInfo {
      * ≤2字符
      */
     @JSONField(name = "SumPeriod")
-    private String sumPeriod;
+    private Integer sumPeriod;
 
     /**
      * 充电明细信息列表
diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/neimenggu/service/NeiMengGuPlatformServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/neimenggu/service/NeiMengGuPlatformServiceImpl.java
index 29d86d289..3b96a971a 100644
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/neimenggu/service/NeiMengGuPlatformServiceImpl.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/neimenggu/service/NeiMengGuPlatformServiceImpl.java
@@ -36,6 +36,8 @@ import com.jsowell.thirdparty.lianlian.domain.*;
 import com.jsowell.thirdparty.lianlian.vo.AccessTokenVO;
 import com.jsowell.thirdparty.lianlian.vo.QueryChargingStatusVO;
 import com.jsowell.thirdparty.platform.ThirdPartyPlatformService;
+import com.jsowell.thirdparty.platform.common.ChargeDetail;
+import com.jsowell.thirdparty.platform.common.OrderInfo;
 import com.jsowell.thirdparty.platform.common.StationInfo;
 import com.jsowell.thirdparty.platform.util.Cryptos;
 import com.jsowell.thirdparty.platform.util.Encodes;