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] 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