From 597e90b77d49872baf19e03524be9b43444fa64f Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 30 八月 2024 10:22:49 +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/TOrderAppealController.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderAppealController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderAppealController.java
index b2ddb1d..e64f518 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderAppealController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderAppealController.java
@@ -73,8 +73,7 @@
@ApiOperation(tags = {"小程序-订单申诉"},value = "查询订单申诉分页列表")
@PostMapping(value = "/pageList")
public AjaxResult<PageInfo<TOrderAppealVO>> pageList(@RequestBody TOrderAppealQuery query) {
- // TODO 用户id 获取小程序当前登录用户id
- Long userId = tokenService.getLoginUser().getUserid();
+ Long userId = tokenService.getLoginUserApplet().getUserId();
query.setAppUserId(userId);
return AjaxResult.ok(orderAppealService.pageList(query));
}
@@ -84,7 +83,7 @@
*/
@GetMapping(value = "/getDetailById")
@ApiOperation(tags = {"小程序-订单申诉"},value = "查询订单申诉详情")
- public AjaxResult<TOrderAppealVO> getDetailById(Integer id) {
+ public AjaxResult<TOrderAppealVO> getDetailById(String id) {
return AjaxResult.ok(orderAppealService.getDetailById(id));
}
--
Gitblit v1.7.1