From af6456c60aa0d3cc931d3c85f652fa7e47d003e3 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 23 六月 2025 11:11:02 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0

---
 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopAppointableTimeServiceImpl.java |   66 +++++++++++++++++++++++++++++++++
 1 files changed, 66 insertions(+), 0 deletions(-)

diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopAppointableTimeServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopAppointableTimeServiceImpl.java
index 00ea027..3564058 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopAppointableTimeServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopAppointableTimeServiceImpl.java
@@ -1,13 +1,79 @@
 package com.ruoyi.shop.service.impl.shop;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.shop.domain.dto.MyAppointmentListDto;
+import com.ruoyi.shop.domain.dto.ShopAppointableTimeListDto;
+import com.ruoyi.shop.domain.vo.MyAppointmentListVo;
+import com.ruoyi.shop.domain.vo.ShopAppointableTimeListVo;
 import com.ruoyi.shop.mapper.shop.ShopAppointableTimeMapper;
 import com.ruoyi.shop.service.shop.ShopAppointableTimeService;
+import com.ruoyi.system.api.domain.poji.member.Member;
 import com.ruoyi.system.api.domain.poji.shop.ShopAppointableTime;
+import com.ruoyi.system.api.service.RemoteMemberService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @author zhibing.pu
  * @Date 2025/5/26 15:15
  */
+@Service
 public class ShopAppointableTimeServiceImpl extends ServiceImpl<ShopAppointableTimeMapper, ShopAppointableTime> implements ShopAppointableTimeService {
+	
+	@Resource
+	private RemoteMemberService remoteMemberService;
+	
+	
+	/**
+	 * 分页查询我的预约
+	 *
+	 * @param page
+	 * @param dto
+	 * @return
+	 */
+	@Override
+	public List<MyAppointmentListVo> pageMyAppointmentList(Page<MyAppointmentListVo> page, MyAppointmentListDto dto) {
+		Long userId = SecurityUtils.getUserId();
+		return this.baseMapper.pageMyAppointmentList(page, userId, dto.getStatus());
+	}
+	
+	
+	/**
+	 * 商户端获取预约列表
+	 *
+	 * @param page
+	 * @param dto
+	 * @return
+	 */
+	@Override
+	public List<ShopAppointableTimeListVo> getShopAppointableTimeList(Page<ShopAppointableTimeListVo> page, ShopAppointableTimeListDto dto) {
+		List<ShopAppointableTime> shopAppointableTimeList = this.baseMapper.getShopAppointableTimeList(page, dto);
+		List<ShopAppointableTimeListVo> list = new ArrayList<>();
+		shopAppointableTimeList.forEach(shopAppointableTime -> {
+			ShopAppointableTimeListVo shopAppointableTimeListVo = new ShopAppointableTimeListVo();
+			shopAppointableTimeListVo.setId(shopAppointableTime.getId());
+			shopAppointableTimeListVo.setAppointableTime(shopAppointableTime.getAppointableTime());
+			shopAppointableTimeListVo.setStatus(shopAppointableTime.getStatus());
+			Member member = remoteMemberService.getMember(shopAppointableTime.getUserId()).getData();
+			shopAppointableTimeListVo.setUserName(member.getRealName());
+			shopAppointableTimeListVo.setMobile(member.getMobile());
+			shopAppointableTimeListVo.setSex(member.getGender() == 1 ? "女" : member.getGender() == 0 ? "男" : "未知");
+			list.add(shopAppointableTimeListVo);
+		});
+		return list;
+	}
+	
+	
+	/**
+	 * 定时任务修改预约状态
+	 */
+	@Override
+	public void taskUpdateStatus() {
+		this.baseMapper.taskUpdateStatus();
+	}
 }

--
Gitblit v1.7.1