From 1442f149019ee0590389abd7a88a79c4d9b59034 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期二, 27 五月 2025 18:23:34 +0800 Subject: [PATCH] bug修改 --- ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java | 13 +++++++++++-- 1 files changed, 11 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 46f6585..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 @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.common.core.vo.PaperInVo; import com.ruoyi.common.core.vo.Path; import com.ruoyi.order.entity.Order; import com.ruoyi.order.request.UserOrderRequest; @@ -43,6 +44,7 @@ * @return 分页 */ Page<Order> queryPage(OrderQueryRequest orderQueryRequest); + List<String> queryPage1(OrderQueryRequest orderQueryRequest); /** * 订单管理-订单统计 @@ -53,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); /** * 订单管理分页模块,订单数量统计 @@ -80,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获取订单数量 @@ -131,4 +133,11 @@ * @return 下单结果 */ String orderEstimate(UserOrderRequest userOrderRequest); + + List<PaperInVo> papercout(String workId,String date); + /** + * 增加发送短信次数 + * @param orderId 订单id + */ + void messageCount(String orderId); } -- Gitblit v1.7.1