From d36bb8b4ea60d1bb0d46bbc0c5dbc02aca86afcd Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 05 六月 2024 08:38:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartOrderController.java | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartOrderController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartOrderController.java
index 6f74ae3..bc81055 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartOrderController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartOrderController.java
@@ -2,9 +2,13 @@
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.order.service.IOrderService;
import com.ruoyi.system.api.domain.dto.MemberOrderDTO;
+import com.ruoyi.system.api.domain.dto.MemberOrderListDTO;
+import com.ruoyi.system.api.domain.vo.MemberOrderListVO;
import com.ruoyi.system.api.domain.vo.MemberTiOrderVO;
+import com.ruoyi.system.api.domain.vo.OrderVO;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -39,4 +43,31 @@
return R.ok(orderService.updMemberOrder(memberOrderDTO));
}
+
+ @PostMapping("/MemberOrderList")
+ @ApiOperation(value = "用户端-订单列表")
+ public R<PageDTO<MemberOrderListVO>> MemberrderList(@RequestBody MemberOrderListDTO memberOrderListDTO) {
+ return R.ok(orderService.MemberrderList(memberOrderListDTO));
+ }
+
+ @PostMapping("/MemberOrderOne")
+ @ApiOperation(value = "用户端-订单详情")
+ public R<OrderVO> MemberOrderOne(@RequestBody MemberOrderListDTO memberOrderListDTO) {
+ return R.ok(orderService.MemberOrderOne(memberOrderListDTO));
+ }
+
+ @PostMapping("/CancelOrderOne")
+ @ApiOperation(value = "用户端-取消订单")
+ public R CancelOrderOne(@RequestBody MemberOrderListDTO memberOrderListDTO) {
+ orderService.MemberOrderOne(memberOrderListDTO);
+ return R.ok();
+ }
+
+ @PostMapping("/AffirmOrderOne")
+ @ApiOperation(value = "用户端-确认收货订单")
+ public R AffirmOrderOne(@RequestBody MemberOrderListDTO memberOrderListDTO) {
+ orderService.AffirmOrderOne(memberOrderListDTO);
+ return R.ok();
+ }
+
}
--
Gitblit v1.7.1