From 90620baea40451d2c34edf0a1edfabf00aac6049 Mon Sep 17 00:00:00 2001
From: 77 <77@77.com>
Date: Sat, 3 Aug 2024 19:26:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/UserGreetServiceImpl.java    | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

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<UserGreetMapper,UserGreet>
     private Yunxin yunxin;
     @Resource
     private UserMapper userMapper;
+    @Autowired
+    private AnchorService anchorService;
 
     @Override
     public List<UserGreet> listByUserId(Long userId) {
@@ -133,13 +137,16 @@ public class UserGreetServiceImpl extends ServiceImpl<UserGreetMapper,UserGreet>
                     }
                 }
             }
-            List<Long> toUserIds = userMapper.getGreetNumId(userId);
-            if(CollectionUtil.isEmpty(toUserIds)){
-                return;
-            }
-            YxDataR<YxCommonR> r = yunxin.batchSendToTextMessage(userId, toUserIds, userGreet.getTitle());
-            if(!r.isSuccess()){
-                throw new ServiceException("发送失败");
+            Anchor anchor = anchorService.getByUserId(userId);
+            if(anchor.getEnableGreet() == 1){
+                List<Long> toUserIds = userMapper.getGreetNumId(userId);
+                if(CollectionUtil.isEmpty(toUserIds)){
+                    return;
+                }
+                YxDataR<YxCommonR> 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);