From 8c5f479dd12b2dfbdd5fe883134f8b2b47890991 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 30 八月 2024 14:12:11 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 19 ++++++++++++++-----
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TCharingOrderVO.java | 2 +-
2 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TCharingOrderVO.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TCharingOrderVO.java
index 8608405..5929188 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TCharingOrderVO.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TCharingOrderVO.java
@@ -8,7 +8,7 @@
import java.math.BigDecimal;
@Data
-@ApiModel(value = "TOrderAppealVO对象", description = "充电桩订单VO")
+@ApiModel(value = "充电桩订单列表对象", description = "充电桩订单VO")
public class TCharingOrderVO {
@ApiModelProperty(value = "分页列表")
private PageInfo<ChargingOrderVO> list;
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 02931ea..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;
/**
@@ -243,8 +242,18 @@
@PostMapping(value = "/chargingOrderInfo")
@ApiOperation(value = "充电桩订单列表查看详情", tags = {"管理后台-订单管理"})
public AjaxResult<ChargingOrderInfoVO> chargingOrderInfo(String orderId) {
-
- return AjaxResult.success();
+ ChargingOrderInfoVO chargingOrderInfoVO = new ChargingOrderInfoVO();
+ 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