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 | 8 ++++----
1 files changed, 4 insertions(+), 4 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 3564058..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
@@ -10,7 +10,7 @@
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.domain.poji.shop.TShopAppointableTime;
import com.ruoyi.system.api.service.RemoteMemberService;
import org.springframework.stereotype.Service;
@@ -23,7 +23,7 @@
* @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;
@@ -52,12 +52,12 @@
*/
@Override
public List<ShopAppointableTimeListVo> getShopAppointableTimeList(Page<ShopAppointableTimeListVo> page, ShopAppointableTimeListDto dto) {
- List<ShopAppointableTime> shopAppointableTimeList = this.baseMapper.getShopAppointableTimeList(page, 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.getAppointableTime());
+ shopAppointableTimeListVo.setAppointableTime(shopAppointableTime.getAppointmentTime());
shopAppointableTimeListVo.setStatus(shopAppointableTime.getStatus());
Member member = remoteMemberService.getMember(shopAppointableTime.getUserId()).getData();
shopAppointableTimeListVo.setUserName(member.getRealName());
--
Gitblit v1.7.1