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/mapper/shop/ShopAppointableTimeMapper.java | 38 ++++++++++++++++++++++++++++++++++++-- 1 files changed, 36 insertions(+), 2 deletions(-) diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/ShopAppointableTimeMapper.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/ShopAppointableTimeMapper.java index 3cfdc6e..dc9a59a 100644 --- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/ShopAppointableTimeMapper.java +++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/ShopAppointableTimeMapper.java @@ -1,11 +1,45 @@ package com.ruoyi.shop.mapper.shop; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.system.api.domain.poji.shop.ShopAppointableTime; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.shop.domain.dto.ShopAppointableTimeListDto; +import com.ruoyi.shop.domain.vo.MyAppointmentListVo; +import com.ruoyi.shop.domain.vo.ShopAppointableTimeListVo; +import com.ruoyi.system.api.domain.poji.shop.TShopAppointableTime; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * @author zhibing.pu * @Date 2025/5/26 15:13 */ -public interface ShopAppointableTimeMapper extends BaseMapper<ShopAppointableTime> { +public interface ShopAppointableTimeMapper extends BaseMapper<TShopAppointableTime> { + + + /** + * 分页查询我的预约列表 + * + * @param page + * @param userId + * @param status + * @return + */ + List<MyAppointmentListVo> pageMyAppointmentList(Page<MyAppointmentListVo> page, @Param("userId") Long userId, @Param("status") Integer status); + + + /** + * 商户端获取预约列表数据 + * + * @param page + * @param dto + * @return + */ + List<TShopAppointableTime> getShopAppointableTimeList(Page<ShopAppointableTimeListVo> page, @Param("item") ShopAppointableTimeListDto dto); + + + /** + * 定时任务修改预约状态 + */ + void taskUpdateStatus(); } -- Gitblit v1.7.1