From c5d38d650d2ac4101b1293a4f17346e7d5420076 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 04 七月 2025 20:39:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0

---
 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopAppointableTimeService.java |   24 +++++++++++++++++++++---
 1 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopAppointableTimeService.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopAppointableTimeService.java
index 76476e1..5063373 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopAppointableTimeService.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopAppointableTimeService.java
@@ -1,10 +1,12 @@
 package com.ruoyi.shop.service.shop;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.baomidou.mybatisplus.plugins.Page;
 import com.ruoyi.shop.domain.dto.MyAppointmentListDto;
+import com.ruoyi.shop.domain.dto.ShopAppointableTimeListDto;
 import com.ruoyi.shop.domain.vo.MyAppointmentListVo;
-import com.ruoyi.system.api.domain.poji.shop.ShopAppointableTime;
+import com.ruoyi.shop.domain.vo.ShopAppointableTimeListVo;
+import com.ruoyi.system.api.domain.poji.shop.TShopAppointableTime;
 
 import java.util.List;
 
@@ -12,7 +14,7 @@
  * @author zhibing.pu
  * @Date 2025/5/26 15:14
  */
-public interface ShopAppointableTimeService extends IService<ShopAppointableTime> {
+public interface ShopAppointableTimeService extends IService<TShopAppointableTime> {
 	
 	
 	/**
@@ -23,4 +25,20 @@
 	 * @return
 	 */
 	List<MyAppointmentListVo> pageMyAppointmentList(Page<MyAppointmentListVo> page, MyAppointmentListDto dto);
+	
+	
+	/**
+	 * 商户端获取预约列表
+	 *
+	 * @param page
+	 * @param dto
+	 * @return
+	 */
+	List<ShopAppointableTimeListVo> getShopAppointableTimeList(Page<ShopAppointableTimeListVo> page, ShopAppointableTimeListDto dto);
+	
+	
+	/**
+	 * 定时任务修改预约状态
+	 */
+	void taskUpdateStatus();
 }

--
Gitblit v1.7.1