update 优化订单详情页展示

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

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;

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;
+
 }