From d33c34c76e74dbacf1bf7a57d7d3109e2bc54e68 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 30 八月 2024 11:49:23 +0800
Subject: [PATCH] 代码提交
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderInfoVO.java | 2 +-
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 18 +++++++++++++-----
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderInfoVO.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderInfoVO.java
index c7af5c8..628d56e 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderInfoVO.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderInfoVO.java
@@ -11,7 +11,7 @@
@Data
@ApiModel(value = "充电桩订单列表查看详情",description = "充电桩订单列表查看详情")
-public class ChargingOrderInfoVO extends TChargingOrder {
+public class ChargingOrderInfoVO{
@ApiModelProperty(value = "充电电流")
private String cdElectronic;
@ApiModelProperty(value = "充电电压")
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
index 4a1c5e8..9c19079 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
@@ -1,4 +1,5 @@
package com.ruoyi.order.controller;
+import com.google.common.collect.Lists;
import java.math.BigDecimal;
import java.time.LocalDateTime;
@@ -50,9 +51,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.PrintWriter;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.List;
/**
@@ -244,8 +243,17 @@
@ApiOperation(value = "充电桩订单列表查看详情", tags = {"管理后台-订单管理"})
public AjaxResult<ChargingOrderInfoVO> chargingOrderInfo(String orderId) {
ChargingOrderInfoVO chargingOrderInfoVO = new ChargingOrderInfoVO();
-
- return AjaxResult.success();
+ chargingOrderInfoVO.setCdElectronic("");
+ chargingOrderInfoVO.setCdVoltage("");
+ chargingOrderInfoVO.setSurplus("");
+ chargingOrderInfoVO.setTotalPower("");
+ chargingOrderInfoVO.setLicensePlate("");
+ chargingOrderInfoVO.setVehicleBrand("");
+ chargingOrderInfoVO.setVehicleModel("");
+ chargingOrderInfoVO.setVehicleUse("");
+ List<TChargingOrderAccountingStrategy> tChargingOrderAccountingStrategies = new ArrayList<>();
+ chargingOrderInfoVO.setList(tChargingOrderAccountingStrategies);
+ return AjaxResult.success(chargingOrderInfoVO);
}
@ResponseBody
--
Gitblit v1.7.1