From 5d42aea349c0a4f9c0ee229c7da76324dcbaca57 Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Fri, 28 Nov 2025 14:47:48 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9AAPP=E8=BF=9B=E5=85=A5=E6=A1=A3?= =?UTF-8?q?=E5=8F=A3=E9=A6=96=E9=A1=B5=E5=8E=BB=E6=8E=89=E6=9D=83=E9=99=90?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/xkt/service/impl/StoreServiceImpl.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreServiceImpl.java index b3cdd8a83..31b6692b4 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreServiceImpl.java @@ -243,13 +243,17 @@ public class StoreServiceImpl implements IStoreService { List storeTagList = this.storeTagMapper.selectList(new LambdaQueryWrapper() .eq(DailyStoreTag::getStoreId, storeId).eq(DailyStoreTag::getDelFlag, Constants.UNDELETED) .orderByAsc(DailyStoreTag::getType)); - // 判断当前用户是否已关注档口 - UserSubscriptions userSub = this.userSubMapper.selectOne(new LambdaQueryWrapper() - .eq(UserSubscriptions::getUserId, SecurityUtils.getUserId()).eq(UserSubscriptions::getStoreId, storeId) - .eq(UserSubscriptions::getDelFlag, Constants.UNDELETED)); - StoreAppResDTO appResDTO = BeanUtil.toBean(store, StoreAppResDTO.class).setStoreId(storeId) - .setAttention(ObjectUtils.isNotEmpty(userSub) ? Boolean.TRUE : Boolean.FALSE) + StoreAppResDTO appResDTO = BeanUtil.toBean(store, StoreAppResDTO.class).setStoreId(storeId).setAttention(Boolean.FALSE) .setTagList(storeTagList.stream().map(DailyStoreTag::getTag).collect(Collectors.toList())); + // 获取当前登录用户，APP可未登录进入档口首页 需调整 + Long userId = SecurityUtils.getUserIdSafe(); + if (ObjectUtils.isNotEmpty(userId)) { + // 判断当前用户是否已关注档口 + UserSubscriptions userSub = this.userSubMapper.selectOne(new LambdaQueryWrapper() + .eq(UserSubscriptions::getUserId, userId).eq(UserSubscriptions::getStoreId, storeId) + .eq(UserSubscriptions::getDelFlag, Constants.UNDELETED)); + appResDTO.setAttention(ObjectUtils.isNotEmpty(userSub) ? Boolean.TRUE : Boolean.FALSE); + } // 获取档口LOGO if (ObjectUtils.isNotEmpty(store.getStoreLogoId())) { SysFile logo = this.fileMapper.selectById(store.getStoreLogoId());