From b0ff90a0a07a75f47b8a722ba0490be51ee49475 Mon Sep 17 00:00:00 2001
From: dute7liang <383200134@qq.com>
Date: Thu, 25 Jan 2024 21:55:44 +0800
Subject: [PATCH] init

---
 .../main/java/com/ruoyi/cai/ws/service/SettleService.java    | 5 +----
 ruoyi-yunxin/src/main/java/com/ruoyi/yunxin/Yunxin.java      | 4 ----
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/service/SettleService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/service/SettleService.java
index 20baa51f..60e539af 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/service/SettleService.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/service/SettleService.java
@@ -156,15 +156,12 @@ public class SettleService {
         Long callId = room.getCallUserData().getId();
         Long receiveId = room.getReceiverUserData().getId();
         if(callTime > 0){
-            ImDataRes imDataRes = ImMsgGen.callNotice(4, callId, receiveId, callTime);
-            yunxin.sendToSync(callId,receiveId,imDataRes);
             yunxinWsService.sendToCallNotifyAsync(callId,receiveId,4,callTime);
         }
         // 接收方通知
         Long anchorIncome = resp.getAnchorIncome();
         if(anchorIncome > 0){
-            ImDataRes imDataRes = ImMsgGen.callNotice(4, receiveId, callId, callTime);
-            yunxin.sendToSync(receiveId,callId,imDataRes);
+            yunxinWsService.sendToCallNotifyAsync(receiveId,callId,4,callTime);
             // 收入通知
 //            ImMsgGen.videoIncome();
 //            yunxin.sendTo(receiveId,null,)
diff --git a/ruoyi-yunxin/src/main/java/com/ruoyi/yunxin/Yunxin.java b/ruoyi-yunxin/src/main/java/com/ruoyi/yunxin/Yunxin.java
index 7ffd4f61..203789ab 100644
--- a/ruoyi-yunxin/src/main/java/com/ruoyi/yunxin/Yunxin.java
+++ b/ruoyi-yunxin/src/main/java/com/ruoyi/yunxin/Yunxin.java
@@ -27,10 +27,6 @@ public class Yunxin {
     @Resource
     private ImMessageClient messageClient;
 
-    public void sendToSync(Long toUid,Long fromUid,Object data){
-        this.sendTo(toUid,fromUid,data);
-    }
-
     public YxDataR<SendMsgResp> sendTo(Long toUid,Long fromUid,Object data){
         SendMsgReq req = new SendMsgReq();
         req.setFrom(fromUid == null ? yunxinProperties.getDefaultFromUid() : fromUid+"");