From 1693c728681a1ed48a64374b1b7313806681154a Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 29 十一月 2024 09:11:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
index e424629..7a8f0ab 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
@@ -2,9 +2,11 @@
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.order.service.OrderService;
import com.ruoyi.order.vo.OrderDetailVO;
import com.ruoyi.order.vo.OrderVO;
+import com.ruoyi.system.api.model.LoginUser;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -31,6 +33,8 @@
public class OrderController {
@Resource
private OrderService orderService;
+ @Resource
+ TokenService tokenService;
/**
@@ -40,9 +44,10 @@
@ApiImplicitParams({
@ApiImplicitParam(value = "订单状态", name = "status", required = true, dataType = "int"),
})
- @GetMapping("/list/{status}")
- public R<List<OrderVO>> list(@PathVariable("status") Integer status){
- return R.ok(orderService.getOrderList(status));
+ @GetMapping("/getMyOrderList/{status}")
+ public R<List<OrderVO>> getMyOrderList(@PathVariable("status") Integer status){
+ LoginUser loginUserApplet = tokenService.getLoginUserApplet();
+ return R.ok(orderService.selectOrderListByUserId(status, loginUserApplet.getUserid()));
}
/**
@@ -74,7 +79,7 @@
*/
@ApiOperation(value = "订单核销", tags = {"小程序-个人中心-门店管理-扫码核销"})
@ApiImplicitParams({
- @ApiImplicitParam(value = "核销码", name = "code", required = true, dataType = "String"),
+ @ApiImplicitParam(value = "订单号", name = "code", required = true, dataType = "String"),
})
@GetMapping("/writeOff/{code}")
public R<Void> writeOff(@PathVariable("code") String code){
--
Gitblit v1.7.1