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/impl/shop/ShopAppointableTimeServiceImpl.java | 50 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 47 insertions(+), 3 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 2cf08f1..e795683 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,15 +1,21 @@
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.baomidou.mybatisplus.plugins.Page;
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.shop.ShopAppointableTime;
+import com.ruoyi.system.api.domain.poji.member.Member;
+import com.ruoyi.system.api.domain.poji.shop.TShopAppointableTime;
+import com.ruoyi.system.api.service.RemoteMemberService;
import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -17,7 +23,10 @@
* @Date 2025/5/26 15:15
*/
@Service
-public class ShopAppointableTimeServiceImpl extends ServiceImpl<ShopAppointableTimeMapper, ShopAppointableTime> implements ShopAppointableTimeService {
+public class ShopAppointableTimeServiceImpl extends ServiceImpl<ShopAppointableTimeMapper, TShopAppointableTime> implements ShopAppointableTimeService {
+
+ @Resource
+ private RemoteMemberService remoteMemberService;
/**
@@ -32,4 +41,39 @@
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<TShopAppointableTime> 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.getAppointmentTime());
+ 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