From 34f741f39e22bf48df33321230380b40c23110c3 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 18 四月 2025 21:34:13 +0800
Subject: [PATCH] 店铺、积分、订单
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 593366c..ef321e2 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
@@ -301,7 +301,7 @@
@PutMapping("/cancelOrder/{orderId}")
- @ApiOperation(value = "取消订单操作", tags = {"管理后台-订单管理"})
+ @ApiOperation(value = "取消订单操作", tags = {"后台-订单管理"})
public R cancelOrder(@PathVariable("orderId") Long orderId) {
return orderService.cancelOrder(orderId);
}
@@ -322,8 +322,8 @@
@GetMapping("/getOrderPageList")
- @ApiOperation(value = "获取订单列表", tags = {"管理后台-订单管理", })
- public R<PageInfo<OrderPageListVo>> getOrderPageList(OrderPageList orderPageList) {
+ @ApiOperation(value = "获取订单列表", tags = {"后台-订单管理", })
+ public R<PageInfo<OrderManagePageListVO>> getOrderPageList(OrderPageList orderPageList) {
return R.ok(orderService.getOrderPageList(orderPageList));
}
@@ -545,7 +545,7 @@
*/
@GetMapping("/exportExpress")
public void exportExpress(HttpServletResponse response, OrderPageList orderPage) {
- //搜索条件，用户姓名
+ /* //搜索条件，用户姓名
if (StringUtils.isNotEmpty(orderPage.getUserName())) {
List<AppUser> data = appUserClient.getAppUserByNameNoFilter(orderPage.getUserName()).getData();
List<Long> collect = data.stream().map(AppUser::getId).collect(Collectors.toList());
@@ -559,7 +559,7 @@
} else {
orderPage.setAppUserIds(collect);
}
- }
+ }*/
//搜索条件，用户电话
if (StringUtils.isNotEmpty(orderPage.getPhone())) {
List<AppUser> data = appUserClient.getAppUserByPhoneNoFilter(orderPage.getPhone()).getData();
--
Gitblit v1.7.1