From 0befca3e70b575c420e7a14fa113aeb74b8fbef8 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 27 十一月 2024 09:05:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 49 insertions(+), 8 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 e913905..b943e89 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
@@ -1,8 +1,10 @@
package com.ruoyi.order.controller;
-import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.order.service.OrderService;
+import com.ruoyi.order.vo.OrderDetailVO;
+import com.ruoyi.order.vo.OrderVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -13,6 +15,7 @@
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
+import java.util.List;
/**
* <p>
@@ -31,6 +34,30 @@
/**
+ * 我的订单列表
+ */
+ @ApiOperation(value = "我的订单列表", tags = {"小程序-个人中心-我的订单"})
+ @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));
+ }
+
+ /**
+ * 订单详情
+ */
+ @ApiOperation(value = "订单详情", tags = {"小程序-订单详情"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
+ })
+ @GetMapping("/detail/{orderId}")
+ public R<OrderDetailVO> detail(@PathVariable("orderId") Long orderId){
+ return R.ok(orderService.getOrderDetail(orderId));
+ }
+
+ /**
* 扫码校验
*/
@ApiOperation(value = "扫码校验", tags = {"小程序-个人中心-门店管理-扫码核销校验"})
@@ -38,21 +65,35 @@
@ApiImplicitParam(value = "分享id", name = "shareId", required = true, dataType = "int"),
})
@GetMapping("/check/{orderId}/{shopId}")
- public AjaxResult check(@PathVariable("orderId") Integer orderId, @PathVariable("shopId") Integer shopId){
- return AjaxResult.ok(orderService.check(orderId, shopId));
+ public R<Boolean> check(@PathVariable("orderId") Long orderId, @PathVariable("shopId") Long shopId){
+ return R.ok(orderService.check(orderId, shopId));
}
/**
- * 订单详情
+ * 订单核销
*/
- @ApiOperation(value = "订单详情", tags = {"订单详情"})
+ @ApiOperation(value = "订单核销", tags = {"小程序-个人中心-门店管理-扫码核销"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "核销码", name = "code", required = true, dataType = "String"),
+ })
+ @GetMapping("/writeOff/{code}")
+ public R<Void> writeOff(@PathVariable("code") String code){
+ return R.ok();
+ }
+
+ /**
+ * 取消订单
+ */
+ @ApiOperation(value = "取消订单", tags = {"小程序-个人中心-我的订单-取消订单"})
@ApiImplicitParams({
@ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
})
- @GetMapping("/detail/{orderId}")
- public AjaxResult detail(@PathVariable("orderId") Integer orderId){
- return AjaxResult.success(orderService.getById(orderId));
+ @GetMapping("/cancel/{orderId}")
+ public R<Void> cancel(@PathVariable("orderId") Long orderId){
+ return R.ok();
}
+
+
}
--
Gitblit v1.7.1