From d33c34c76e74dbacf1bf7a57d7d3109e2bc54e68 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期五, 30 八月 2024 11:49:23 +0800 Subject: [PATCH] 代码提交 --- ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 22 ++++++++++++++++------ 1 files changed, 16 insertions(+), 6 deletions(-) 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 ce20d5a..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; @@ -26,6 +27,7 @@ import com.ruoyi.order.api.model.*; import com.ruoyi.order.api.query.ChargingOrderQuery; import com.ruoyi.order.api.query.TChargingCountQuery; +import com.ruoyi.order.api.vo.ChargingOrderInfoVO; import com.ruoyi.order.api.vo.ChargingOrderVO; import com.ruoyi.order.api.vo.TCharingOrderVO; import com.ruoyi.order.dto.GetMyChargingOrderList; @@ -49,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; /** @@ -241,9 +241,19 @@ @ResponseBody @PostMapping(value = "/chargingOrderInfo") @ApiOperation(value = "充电桩订单列表查看详情", tags = {"管理后台-订单管理"}) - public AjaxResult<TCharingOrderVO> chargingOrderInfo(String orderId) { - - return AjaxResult.success(); + public AjaxResult<ChargingOrderInfoVO> chargingOrderInfo(String orderId) { + 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