From 315be47531c8c4cec9187e80a660dd3a8b77193e Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期五, 16 八月 2024 15:29:29 +0800
Subject: [PATCH] 新增加管理后台接口和修复运行异常问题

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java |   30 +++++++++++++++++++++++++++++-
 1 files changed, 29 insertions(+), 1 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 d05882b..5f8f666 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
@@ -3,13 +3,21 @@
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.BasePage;
+import com.ruoyi.common.core.web.page.PageInfo;
 import com.ruoyi.order.api.model.TChargingOrder;
 import com.ruoyi.order.api.query.TChargingCountQuery;
+import com.ruoyi.order.dto.GetMyChargingOrderList;
+import com.ruoyi.order.dto.MyChargingOrderInfo;
 import com.ruoyi.order.service.TChargingOrderService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -58,11 +66,31 @@
      * @param chargingGunId 充电枪id
      * @return
      */
-    @GetMapping(value = "/getOrderDetailByGunId")
+    @PostMapping(value = "/getOrderDetailByGunId")
     public R<TChargingOrder> getOrderDetailByGunId(@RequestParam("chargingGunId") Integer chargingGunId){
         TChargingOrder one = chargingOrderService.getOne(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getChargingGunId, chargingGunId)
                 .eq(TChargingOrder::getDelFlag, 0).eq(TChargingOrder::getStatus, 3));
         return R.ok(one);
     }
+    
+    
+    
+    
+    @ResponseBody
+    @GetMapping(value = "/getMyChargingOrderList")
+    @ApiOperation(value = "获取充电记录列表", tags = {"小程序-充电记录"})
+    public AjaxResult<Map<String, Object>> getMyChargingOrderList(GetMyChargingOrderList query){
+        Map<String, Object> orderList = chargingOrderService.getMyChargingOrderList(query);
+        return AjaxResult.success(orderList);
+    }
+    
+    
+    @ResponseBody
+    @GetMapping(value = "/getMyChargingOrderInfo")
+    @ApiOperation(value = "获取充电记订单明细", tags = {"小程序-充电记录"})
+    public AjaxResult<MyChargingOrderInfo> getMyChargingOrderInfo(String id){
+        MyChargingOrderInfo myChargingOrderInfo = chargingOrderService.getMyChargingOrderInfo(id);
+        return AjaxResult.success(myChargingOrderInfo);
+    }
 }
 

--
Gitblit v1.7.1