diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserGreetServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserGreetServiceImpl.java index e25aaca6..6802055f 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserGreetServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserGreetServiceImpl.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.cai.constant.RedisHttpConstant; +import com.ruoyi.cai.domain.Anchor; import com.ruoyi.cai.domain.User; import com.ruoyi.cai.domain.UserGreet; import com.ruoyi.cai.dto.admin.vo.UserGreetAdminVo; @@ -17,6 +18,7 @@ import com.ruoyi.cai.manager.LockManager; import com.ruoyi.cai.manager.SystemConfigManager; import com.ruoyi.cai.mapper.UserGreetMapper; import com.ruoyi.cai.mapper.UserMapper; +import com.ruoyi.cai.service.AnchorService; import com.ruoyi.cai.service.UserGreetService; import com.ruoyi.cai.service.UserService; import com.ruoyi.common.core.domain.PageQuery; @@ -58,6 +60,8 @@ public class UserGreetServiceImpl extends ServiceImpl private Yunxin yunxin; @Resource private UserMapper userMapper; + @Autowired + private AnchorService anchorService; @Override public List listByUserId(Long userId) { @@ -133,13 +137,16 @@ public class UserGreetServiceImpl extends ServiceImpl } } } - List toUserIds = userMapper.getGreetNumId(userId); - if(CollectionUtil.isEmpty(toUserIds)){ - return; - } - YxDataR r = yunxin.batchSendToTextMessage(userId, toUserIds, userGreet.getTitle()); - if(!r.isSuccess()){ - throw new ServiceException("发送失败"); + Anchor anchor = anchorService.getByUserId(userId); + if(anchor.getEnableGreet() == 1){ + List toUserIds = userMapper.getGreetNumId(userId); + if(CollectionUtil.isEmpty(toUserIds)){ + return; + } + YxDataR r = yunxin.batchSendToTextMessage(userId, toUserIds, userGreet.getTitle()); + if(!r.isSuccess()){ + throw new ServiceException("发送失败"); + } } stringRedisTemplate.opsForValue().set(userGreetSendTime,DateUtil.currentSeconds()+"",1,TimeUnit.DAYS); stringRedisTemplate.opsForValue().increment(numKey);