From c2abc4e2e4ecd8c9267dac1dc26940127bd76a20 Mon Sep 17 00:00:00 2001
From: chc <1501738723@qq.com>
Date: Mon, 20 Mar 2023 12:03:34 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DIM=E6=96=B0=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E4=B8=8E=E8=87=AA=E5=B7=B1=E5=AF=B9=E8=AF=9D=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/im/service/ImTalkService.java     |  7 +++
 .../im/serviceimpl/ImTalkServiceImpl.java     | 44 +++++++++++++++++++
 .../lili/controller/im/ImTalkController.java  |  2 +-
 3 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/framework/src/main/java/cn/lili/modules/im/service/ImTalkService.java b/framework/src/main/java/cn/lili/modules/im/service/ImTalkService.java
index 3b6f92eab..b648a393f 100644
--- a/framework/src/main/java/cn/lili/modules/im/service/ImTalkService.java
+++ b/framework/src/main/java/cn/lili/modules/im/service/ImTalkService.java
@@ -21,6 +21,13 @@ public interface ImTalkService extends IService<ImTalk> {
      */
     ImTalk getTalkByUser(String userId1);
 
+    /**
+     * 获取与某人的聊天
+     * @param userId
+     * @return
+     */
+    ImTalkVO getTalkByUserId(String userId);
+
     /**
      * 置顶消息
      *
diff --git a/framework/src/main/java/cn/lili/modules/im/serviceimpl/ImTalkServiceImpl.java b/framework/src/main/java/cn/lili/modules/im/serviceimpl/ImTalkServiceImpl.java
index c03f4c017..b5a4b17f3 100644
--- a/framework/src/main/java/cn/lili/modules/im/serviceimpl/ImTalkServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/im/serviceimpl/ImTalkServiceImpl.java
@@ -88,6 +88,50 @@ public class ImTalkServiceImpl extends ServiceImpl<ImTalkMapper, ImTalk> impleme
         return imTalk;
     }
 
+    @Override
+    public ImTalkVO getTalkByUserId(String userId) {
+        LambdaQueryWrapper<ImTalk> queryWrapper = new LambdaQueryWrapper<>();
+        AuthUser currentUser = Objects.requireNonNull(UserContext.getCurrentUser());
+        //登录用户的Id
+        String selfId = "";
+        //查看当前用户角色对Id进行赋值
+        if(UserEnums.STORE.equals(currentUser.getRole())){
+            selfId = currentUser.getStoreId();
+        }else if(UserEnums.MEMBER.equals(currentUser.getRole())){
+            selfId = currentUser.getId();
+        }
+        //小数在前保证永远是同一个对话
+        String finalSelfId = selfId;
+        queryWrapper.and(wq-> wq.eq(ImTalk::getUserId2, userId).eq(ImTalk::getUserId1, finalSelfId).or().eq(ImTalk::getUserId2, finalSelfId).eq(ImTalk::getUserId1, userId));
+        ImTalk imTalk = this.getOne(queryWrapper);
+        //如果没有聊天，则创建聊天
+        if (imTalk == null) {
+            //当自己为店铺时
+            if(UserEnums.STORE.equals(currentUser.getRole())){
+                Store selfStore = storeService.getById(selfId);
+                //没有这个用户信息
+                Member other = memberService.getById(userId);
+                if(other == null){
+                    return null;
+                }
+                //自己为店铺其他人必定为用户
+                imTalk = new ImTalk(other,selfStore);
+            }else if(UserEnums.MEMBER.equals(currentUser.getRole())){
+                //没有这个店铺信息
+                Member self = memberService.getById(selfId);
+                Member otherMember = memberService.getById(userId);
+                Store otherStore = storeService.getById(userId);
+                if(otherStore != null){
+                    imTalk = new ImTalk(self, otherStore);
+                }else if (otherMember != null){
+                    imTalk = new ImTalk(self, otherMember);
+                }
+            }
+            this.save(imTalk);
+        }
+        return new ImTalkVO(imTalk,currentUser.getId());
+    }
+
     /**
      * 发起聊天后，如果聊天不可见为true，则需要修正
      *
diff --git a/im-api/src/main/java/cn/lili/controller/im/ImTalkController.java b/im-api/src/main/java/cn/lili/controller/im/ImTalkController.java
index 3ecbcd355..eee31a4a7 100644
--- a/im-api/src/main/java/cn/lili/controller/im/ImTalkController.java
+++ b/im-api/src/main/java/cn/lili/controller/im/ImTalkController.java
@@ -46,7 +46,7 @@ public class ImTalkController {
     @GetMapping(value = "/by/user/{userId}")
     @ApiOperation(value = "查看与某人聊天详情")
     public ResultMessage<ImTalkVO> getByUser(@PathVariable String userId) {
-        return ResultUtil.data(new ImTalkVO(imTalkService.getTalkByUser(userId),userId));
+        return ResultUtil.data(imTalkService.getTalkByUserId(userId));
     }
 
     @GetMapping(value = "/top")