From 88dec86f1b55260c9220a034b2a5adaca02ac454 Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Thu, 6 Jul 2023 15:33:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8A=A0=E5=85=A5=E9=93=83=E5=A3=B0?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PushApplicationServiceImpl.java         | 4 +++-
 .../service/impl/PushConcernFanServiceImpl.java          | 9 ++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushApplicationServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushApplicationServiceImpl.java
index 15f79db1..80bcb1b9 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushApplicationServiceImpl.java
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushApplicationServiceImpl.java
@@ -59,6 +59,7 @@ public class PushApplicationServiceImpl extends ServiceImpl<PushApplicationMappe
     private final IPushChatMessageService iPushChatMessageService;
     private final IPushConcernFanTypeService iPushConcernFanTypeService;
     private final IPushEnterpriseService iPushEnterpriseService;
+    private final IPushRingtoneService iPushRingtoneService;
 
     @Override
     public void enterpriseMessageSend(PushChatMessage pushChatMessage) {
@@ -121,7 +122,8 @@ public class PushApplicationServiceImpl extends ServiceImpl<PushApplicationMappe
                 pushChatMessage.setPlayVibrate(pushConcernFanType.getPlayVibrate());
                 pushChatMessage.setPlayToText(pushConcernFanType.getPlayToText());
                 pushChatMessage.setSound(pushConcernFanType.getOfflineRingtone());
-                pushChatMessage.setOnlineRingtone(pushConcernFanType.getOnlineRingtone());
+                pushChatMessage.setOnlineRingtone(Optional.ofNullable(iPushRingtoneService.getById(pushConcernFanType.getOnlineRingtone()))
+                        .orElse(null).getRingtone());
             }
 
             pushChatMessage.setType("customizedcast");
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushConcernFanServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushConcernFanServiceImpl.java
index 9df05e19..7c4102e1 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushConcernFanServiceImpl.java
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushConcernFanServiceImpl.java
@@ -15,10 +15,7 @@ import com.cloud.kicc.commonbiz.api.entity.PushConcernFan;
 import com.cloud.kicc.commonbiz.api.entity.PushConcernFanType;
 import com.cloud.kicc.commonbiz.api.enums.PushAuditStatusEnum;
 import com.cloud.kicc.commonbiz.mapper.PushConcernFanMapper;
-import com.cloud.kicc.commonbiz.service.IPushBlacklistService;
-import com.cloud.kicc.commonbiz.service.IPushChatMessageService;
-import com.cloud.kicc.commonbiz.service.IPushConcernFanService;
-import com.cloud.kicc.commonbiz.service.IPushConcernFanTypeService;
+import com.cloud.kicc.commonbiz.service.*;
 import com.cloud.kicc.commonbiz.util.PushClientUtil;
 import lombok.RequiredArgsConstructor;
 import okhttp3.OkHttpClient;
@@ -48,6 +45,7 @@ public class PushConcernFanServiceImpl extends ServiceImpl<PushConcernFanMapper,
     private final IPushBlacklistService iPushBlacklistService;
     private final IPushChatMessageService iPushChatMessageService;
     private final IPushConcernFanTypeService iPushConcernFanTypeService;
+    private final IPushRingtoneService iPushRingtoneService;
 
     @Override
     public IPage<Map<String, Object>> selectPushConcernFanList(IPage<Map<String, Object>> page, Map<String, Object> map) {
@@ -131,7 +129,8 @@ public class PushConcernFanServiceImpl extends ServiceImpl<PushConcernFanMapper,
                 pushChatMessage.setPlayVibrate(pushConcernFanType.getPlayVibrate());
                 pushChatMessage.setPlayToText(pushConcernFanType.getPlayToText());
                 pushChatMessage.setSound(pushConcernFanType.getOfflineRingtone());
-                pushChatMessage.setOnlineRingtone(pushConcernFanType.getOnlineRingtone());
+                pushChatMessage.setOnlineRingtone(Optional.ofNullable(iPushRingtoneService.getById(pushConcernFanType.getOnlineRingtone()))
+                        .orElse(null).getRingtone());
             }
 
             pushChatMessage.setType("customizedcast");