From 31807d325d532edfede5075e58645c4c83a4775e Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Mon, 17 Apr 2023 15:58:32 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E7=AB=99=E7=82=B9=E4=BF=A1=E6=81=AF=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=20=E6=80=BB=E7=A9=BA=E9=97=B2=E8=AE=BE=E5=A4=87=E6=95=B0=20?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pile/service/impl/PileStationInfoServiceImpl.java        | 1 +
 .../main/java/com/jsowell/pile/vo/base/StationInfoVO.java    | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java
index fc2fe25cc..d3d8227da 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java
@@ -361,6 +361,7 @@ public class PileStationInfoServiceImpl implements IPileStationInfoService {
 			stationVO.setFastFree(fastFree);
 			stationVO.setSlowTotal(slowTotal);
 			stationVO.setSlowFree(slowFree);
+			stationVO.setTotalFree(fastFree + slowFree);
 
 			// 查询当前时段电费
 			CurrentTimePriceDetails currentTimePriceDetails = pileBillingTemplateService.getCurrentTimePriceDetails(stationVO.getStationId());
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/StationInfoVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/StationInfoVO.java
index b229e0727..0433204d0 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/StationInfoVO.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/StationInfoVO.java
@@ -75,6 +75,11 @@ public class StationInfoVO {
 	 */
 	private int slowFree;
 
+	/**
+	 * 总空闲枪口数
+	 */
+	private int totalFree;
+
 	/**
 	 * 经度
 	 */

From 1c097ffe030cb013181253dc793d743863f694d5 Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Mon, 17 Apr 2023 17:02:55 +0800
Subject: [PATCH 2/2] update

---
 .../com/jsowell/pile/vo/lianlian/AccumulativeInfoVO.java    | 6 ++++++
 .../src/main/resources/mapper/pile/OrderBasicInfoMapper.xml | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/lianlian/AccumulativeInfoVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/lianlian/AccumulativeInfoVO.java
index cbb35824e..526491d93 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/lianlian/AccumulativeInfoVO.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/lianlian/AccumulativeInfoVO.java
@@ -10,6 +10,12 @@ import lombok.Data;
  */
 @Data
 public class AccumulativeInfoVO {
+
+    /**
+     * 订单编号
+     */
+    private String orderCode;
+
     /**
      * 枪口编号
      */
diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
index d0c770134..eabb8881a 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
@@ -925,10 +925,11 @@
 
     <select id="getAccumulativeInfoForLianLian" resultType="com.jsowell.pile.vo.lianlian.AccumulativeInfoVO">
         SELECT
+            t1.order_code as orderCode,
             t1.pile_connector_code as pileConnectorCode,
             t1.pile_sn as pileSn,
             t1.station_id as stationId,
-            t2.total_used_electricity as connectorElectricity
+            IFNULL(t2.total_used_electricity,0.00) as connectorElectricity
         FROM
             order_basic_info t1
                 JOIN order_detail t2 ON t1.order_code = t2.order_code