From 08ee411b1f9a02d487ca3190b44d29ea08bde824 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期二, 17 十二月 2024 15:55:01 +0800
Subject: [PATCH] 1
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 51 insertions(+), 2 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 ae6f9d3..1f95358 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
@@ -14,8 +14,7 @@
import com.ruoyi.order.model.Order;
import com.ruoyi.order.service.CommissionService;
import com.ruoyi.order.service.OrderService;
-import com.ruoyi.order.vo.OrderDetailVO;
-import com.ruoyi.order.vo.OrderVO;
+import com.ruoyi.order.vo.*;
import com.ruoyi.other.api.domain.BaseSetting;
import com.ruoyi.other.api.feignClient.BaseSettingClient;
import com.ruoyi.system.api.model.LoginUser;
@@ -206,7 +205,57 @@
return R.ok();
}
+ @PostMapping("/getLastOrder")
+ public R<Order> getLastOrder(@RequestParam("appUserId") Long appUserId){
+ Order one = orderService.lambdaQuery().eq(Order::getAppUserId, appUserId).orderByDesc(Order::getCreateTime).last("limit 1").one();
+ return R.ok(one);
+ }
+
+
+ @ResponseBody
+ @GetMapping("/getOrderPageList")
+ @ApiOperation(value = "获取订单列表", tags = {"管理后台-订单管理", "门店后台-订单管理"})
+ public TableDataInfo<OrderPageListVo> getOrderPageList(OrderPageList orderPageList){
+ startPage();
+ List<OrderPageListVo> list = orderService.getOrderPageList(orderPageList);
+ return getDataTable(list);
+ }
+
+
+ @ResponseBody
+ @PutMapping("/confirmDelivery/{orderId}")
+ @ApiOperation(value = "已发货操作", tags = {"管理后台-订单管理"})
+ public R confirmDelivery(@PathVariable("orderId") String orderId, String code){
+ return orderService.confirmDelivery(orderId, code);
+ }
+
+
+ @ResponseBody
+ @PutMapping("/cancelOrder/{orderId}")
+ @ApiOperation(value = "取消订单操作", tags = {"管理后台-订单管理"})
+ public R cancelOrder(@PathVariable("orderId") Long orderId){
+ return orderService.cancelOrder(orderId);
+ }
+
+ @ResponseBody
+ @PutMapping("/receivingOperation/{orderId}")
+ @ApiOperation(value = "收货操作", tags = {"管理后台-订单管理"})
+ public R receivingOperation(@PathVariable("orderId") Long orderId){
+ return orderService.receivingOperation(orderId);
+ }
+
+
+ @ResponseBody
+ @GetMapping("/getOrderInfo/{orderId}")
+ @ApiOperation(value = "查询订单详情", tags = {"管理后台-订单管理"})
+ public R<OrderInfoVo> getOrderInfo(@PathVariable("orderId") Long orderId){
+ OrderInfoVo orderInfo = orderService.getOrderInfo(orderId);
+ return R.ok(orderInfo);
+ }
+
+
+
}
--
Gitblit v1.7.1