From 428519bd1056dd90cd4589dbf85b380e403ff254 Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期五, 05 七月 2024 18:13:08 +0800
Subject: [PATCH] feat: 代码初始化、腾讯云短信SDK
---
ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/OrderController.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/OrderController.java b/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/OrderController.java
index 4214a41..4053942 100644
--- a/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/OrderController.java
+++ b/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/OrderController.java
@@ -6,6 +6,8 @@
import com.ruoyi.common.core.constant.Constants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.GlobalException;
+import com.ruoyi.common.security.service.TokenService;
+import com.ruoyi.system.api.model.LoginUserInfo;
import com.ruoyi.user.entity.Order;
import com.ruoyi.user.entity.ServeRecord;
import com.ruoyi.user.request.OrderRequest;
@@ -40,6 +42,21 @@
private ServeRecordService serveRecordService;
@Resource
private AdminClient adminClient;
+ @Resource
+ private TokenService tokenService;
+
+ @GetMapping("/orderList")
+ @ApiOperation(value = "订单列表", tags = {"用户端-订单"})
+ public R<List<Order>> orderList() {
+ LoginUserInfo loginUser = tokenService.getLoginUserByUser();
+ if (null == loginUser) {
+ return R.loginExpire("登录失效！");
+ }
+ return R.ok(orderService.lambdaQuery()
+ .eq(Order::getIsDelete, 0)
+ .eq(Order::getUserId, loginUser.getUserid())
+ .orderByDesc(Order::getCreateTime).list());
+ }
@GetMapping("/detail")
@ApiOperation(value = "订单详情", tags = {"用户端-订单"})
@@ -86,9 +103,14 @@
}
@PostMapping("/placeOrder")
- @ApiOperation(value = "下单", tags = {"用户端-订单"})
+ @ApiOperation(value = "用户下单", tags = {"用户端-订单"})
public R<String> placeOrder(@RequestBody OrderRequest orderRequest) {
- return R.ok();
+ LoginUserInfo loginUser = tokenService.getLoginUserByUser();
+ if (null == loginUser) {
+ return R.loginExpire("登录失效！");
+ }
+ Boolean result = orderService.placeOrder(orderRequest, loginUser.getUserid());
+ return result ? R.ok() : R.fail();
}
}
--
Gitblit v1.7.1