From 1668fe1b912d07191c9fd7f20808d7d2162bc8e8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 21 四月 2025 17:09:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java
index 4c0fc0f..7bd0d19 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java
@@ -44,6 +44,7 @@
* @return 分页
*/
Page<Order> queryPage(OrderQueryRequest orderQueryRequest);
+ List<String> queryPage1(OrderQueryRequest orderQueryRequest);
/**
* 订单管理-订单统计
@@ -54,7 +55,7 @@
* @param page 分页
* @return 分页统计
*/
- Page<OrderCountVO> orderCount(String name, String phone, List<String> cityList, Page<OrderCountVO> page);
+ Page<OrderCountVO> orderCount(String name, String phone, List<String> cityList, Page<OrderCountVO> page,List<String> siteIds);
/**
* 订单管理分页模块，订单数量统计
@@ -81,7 +82,7 @@
* @param pageSize 条数
* @return 交易额
*/
- Page<Order> orderListWorker(Integer userId, Integer state, Integer pageNum, Integer pageSize);
+ Page<Order> orderListWorker(Integer userId, Integer state,String searchValues, Integer pageNum, Integer pageSize);
/**
* 师傅端-根据师傅id获取订单数量
--
Gitblit v1.7.1