From 6576fbb2d26c88710353e114cdc003b347a9b8c0 Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Wed, 12 Jul 2023 16:50:50 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/AdapayMemberAccountServiceImpl.java  |  4 ++--
 .../pile/service/impl/OrderBasicInfoServiceImpl.java  |  8 ++++++++
 .../java/com/jsowell/pile/vo/web/OrderListVO.java     | 11 +++++++++++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayMemberAccountServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayMemberAccountServiceImpl.java
index fe4ace2fb..9b1f73cd1 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayMemberAccountServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayMemberAccountServiceImpl.java
@@ -68,9 +68,9 @@ public class AdapayMemberAccountServiceImpl implements IAdapayMemberAccountServi
     }
 
     /**
-     * 修改【请填写功能名称】
+     * 修改
      *
-     * @param adapayMemberAccount 【请填写功能名称】
+     * @param adapayMemberAccount
      * @return 结果
      */
     @Override
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
index c36d60ff0..fc19c18b2 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
@@ -205,6 +205,14 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
                 }
                 orderListVO.setPileConnectorCode(orderListVO.getPileSn() + orderListVO.getConnectorCode());
                 orderListVO.setOrderStatusDescribe(transformOrderStatusDescribe(orderListVO.getOrderStatus(), orderListVO.getPayStatus()));
+
+                // 获取实时消费金额
+                List<RealTimeMonitorData> chargingRealTimeData = getChargingRealTimeData(orderListVO.getTransactionCode());
+                if (CollectionUtils.isNotEmpty(chargingRealTimeData)) {
+                    RealTimeMonitorData realTimeMonitorData = chargingRealTimeData.get(0);
+                    orderListVO.setRealTimeAmount(new BigDecimal(realTimeMonitorData.getChargingAmount()));
+                    orderListVO.setRealTimeSoc(realTimeMonitorData.getSOC());
+                }
             }
         }
         return orderListVOS;
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderListVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderListVO.java
index d95363bb6..8f3451906 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderListVO.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderListVO.java
@@ -135,6 +135,11 @@ public class OrderListVO {
     @Excel(name = "终止soc", suffix = "%")
     private String endSoc;
 
+    /**
+     * 实时SOC
+     */
+    private String realTimeSoc;
+
     /**
      * 开始充电时间
      */
@@ -203,4 +208,10 @@ public class OrderListVO {
      * 服务费金额
      */
     private BigDecimal totalServiceAmount;
+
+    /**
+     * 实时消费金额
+     */
+    private BigDecimal realTimeAmount;
+
 }