From 452d17b1c16bfe8585c16bd82e67450abd97c82f Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 14 七月 2025 17:57:25 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopAppointableTimeServiceImpl.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 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..b627ec7 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,17 +52,21 @@
*/
@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());
shopAppointableTimeListVo.setMobile(member.getMobile());
- shopAppointableTimeListVo.setSex(member.getGender() == 1 ? "女" : member.getGender() == 0 ? "男" : "未知");
+ if (null == member.getGender()) {
+ shopAppointableTimeListVo.setSex("未知");
+ } else {
+ shopAppointableTimeListVo.setSex(member.getGender() == 1 ? "女" : member.getGender() == 0 ? "男" : "未知");
+ }
list.add(shopAppointableTimeListVo);
});
return list;
--
Gitblit v1.7.1