From 85a21fdb54fa06f2fa6e25e763ec5337e85295e7 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 16 八月 2024 16:55:34 +0800
Subject: [PATCH] 小程序登录 token失效全局异常
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 37 ++++++++++++++++++++++++++++++++++---
1 files changed, 34 insertions(+), 3 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 075ac4a..9b405c1 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,23 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.security.service.TokenService;
+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 org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
import java.util.List;
/**
@@ -27,6 +37,8 @@
@Resource
private TChargingOrderService chargingOrderService;
+ @Autowired
+ private TokenService tokenService;
/**
* 查询用户最近一次充电记录使用的车辆
* @param
@@ -34,9 +46,8 @@
*/
@PostMapping(value = "/getCar")
public R<Long> getCar() {
- // todo 获取用户id
List<TChargingOrder> list = chargingOrderService.list(new LambdaQueryWrapper<TChargingOrder>()
- .eq(TChargingOrder::getAppUserId, 11)
+ .eq(TChargingOrder::getAppUserId, tokenService.getLoginUserApplet().getUserid())
.isNotNull(TChargingOrder::getAppUserCarId));
if (!list.isEmpty()){
// 最近使用的车辆id
@@ -78,11 +89,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