手动结算订单

jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java

@@ -1,5 +1,6 @@
 package com.jsowell.pile.vo.web;
 
+import com.jsowell.common.core.domain.ykc.RealTimeMonitorData;
 import com.jsowell.pile.vo.base.PileInfoVO;
 import com.jsowell.pile.vo.uniapp.MemberVO;
 import lombok.Data;
@@ -26,12 +27,14 @@ public class OrderDetailInfoVO {
 	// 支付信息
 	private List<PayRecord> payRecordList;
 
-	// 枪口信息
-	private List<RealTimeMonitorData> realTimeMonitorDataList;
+	// 枪口监控信息
+	private List<PileMonitorData> realTimeMonitorDataList;
 
 	// 订单相关实时数据
 	private OrderRealTimeInfo orderRealTimeInfo;
 
+	private RealTimeMonitorData lastMonitorData;
+
 	// billingDetails
 
 	@Data
@@ -57,6 +60,7 @@ public class OrderDetailInfoVO {
 	@Data
 	public static class OrderInfo {
 		private String orderCode; // 订单编号
+		private String transactionCode; // 交易流水号
 		private String orderStatus; // 订单状态
 		private String orderStatusDescribe; // 订单状态描述
 		private String startTime; // 充电开始时间
@@ -79,7 +83,7 @@ public class OrderDetailInfoVO {
 	}
 
 	@Data
-	public static class RealTimeMonitorData{
+	public static class PileMonitorData {
 		private String instantCurrent; // 实时电流
 		private String instantVoltage; // 实时电压
 		private String instantPower; // 实时功率