From d1cab4b2f2690d1331f12f0d9de78bbbf926f390 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 16 一月 2025 14:27:51 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TechnicianSubscribeService.java |   22 +++++++++++++++++++---
 1 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TechnicianSubscribeService.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TechnicianSubscribeService.java
index d3796aa..906846b 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TechnicianSubscribeService.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TechnicianSubscribeService.java
@@ -1,8 +1,12 @@
 package com.ruoyi.other.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.web.page.PageInfo;
 import com.ruoyi.other.api.domain.TechnicianSubscribe;
 import com.ruoyi.other.vo.TechnicianSubscribeVO;
+import io.swagger.annotations.ApiParam;
 
 import java.util.List;
 
@@ -19,9 +23,21 @@
     /**
      * 查询用于指定门店的相关预约记录
      */
-    List<TechnicianSubscribeVO> getTechnicianSubscribeByUserAndShop(Long userId, Long shopId);
+    PageInfo<TechnicianSubscribeVO> getTechnicianSubscribeByUserAndShop(Long shopId, Integer status, Integer pageCurr, Integer pageSize);
+    PageInfo<TechnicianSubscribeVO> getTechnicianSubscribeByUserAndShop1(Long shopId, Integer status , String phone,
+                                                                         String name,
+                                                                         Integer serviceMode, Integer pageCurr, Integer pageSize);
 
-    List<TechnicianSubscribeVO> getTechnicianSubscribeByUser(Long userId, Integer status);
+    IPage<TechnicianSubscribeVO> getTechnicianSubscribeByUser(Page<TechnicianSubscribe> page, Long userId, Integer status);
 
-    void subscribe(TechnicianSubscribe technicianSubscribe, Long technicianId);
+    void subscribe(TechnicianSubscribe technicianSubscribe);
+
+
+    
+
+
+    /**
+     * 定时修改到期状态
+     */
+    void taskEditStstus();
 }

--
Gitblit v1.7.1