From 541ee81300b745dbe3d345519017955e75d7eadd Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 10 Jan 2023 23:24:08 +0800
Subject: [PATCH] =?UTF-8?q?mp=EF=BC=9A=E5=89=8D=E7=AB=AF=E6=8E=A5=E5=85=A5?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/message/MpMessageController.java    |  9 +--
 .../mp/service/message/MpMessageService.java  |  4 +-
 .../service/message/MpMessageServiceImpl.java |  9 ++-
 yudao-ui-admin/src/api/mp/message.js          | 28 +++-----
 .../src/views/mp/components/wx-msg/main.vue   | 66 +++++++++++--------
 yudao-ui-admin/src/views/mp/message/index.vue |  2 +-
 6 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/controller/admin/message/MpMessageController.java b/yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/controller/admin/message/MpMessageController.java
index 9c83172aa..911bddc8a 100644
--- a/yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/controller/admin/message/MpMessageController.java
+++ b/yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/controller/admin/message/MpMessageController.java
@@ -37,10 +37,11 @@ public class MpMessageController {
     }
 
     @PostMapping("/send")
-//    @ApiOperation("获得粉丝消息表分页")
-//    @PreAuthorize("@ss.hasPermission('mp:message:query')")
-    public CommonResult<Long> sendMessage(@Valid @RequestBody MpMessageSendReqVO reqVO) {
-        return success(mpMessageService.sendKefuMessage(reqVO));
+    @ApiOperation("给粉丝发送消息")
+    @PreAuthorize("@ss.hasPermission('mp:message:send')")
+    public CommonResult<MpMessageRespVO> sendMessage(@Valid @RequestBody MpMessageSendReqVO reqVO) {
+        MpMessageDO message = mpMessageService.sendKefuMessage(reqVO);
+        return success(MpMessageConvert.INSTANCE.convert(message));
     }
 
 }
diff --git a/yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/service/message/MpMessageService.java b/yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/service/message/MpMessageService.java
index c997cae1d..b72f264df 100644
--- a/yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/service/message/MpMessageService.java
+++ b/yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/service/message/MpMessageService.java
@@ -52,8 +52,8 @@ public interface MpMessageService {
      * 注意，该方法会真实发送消息
      *
      * @param sendReqVO 消息内容
-     * @return 消息编号
+     * @return 消息
      */
-    Long sendKefuMessage(MpMessageSendReqVO sendReqVO);
+    MpMessageDO sendKefuMessage(MpMessageSendReqVO sendReqVO);
 
 }
diff --git a/yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/service/message/MpMessageServiceImpl.java b/yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/service/message/MpMessageServiceImpl.java
index a71bc64a8..229cc52c0 100644
--- a/yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/service/message/MpMessageServiceImpl.java
+++ b/yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/service/message/MpMessageServiceImpl.java
@@ -104,7 +104,7 @@ public class MpMessageServiceImpl implements MpMessageService {
     }
 
     @Override
-    public Long sendKefuMessage(MpMessageSendReqVO sendReqVO) {
+    public MpMessageDO sendKefuMessage(MpMessageSendReqVO sendReqVO) {
         // 校验消息格式
         MpUtils.validateMessage(validator, sendReqVO.getType(), sendReqVO);
 
@@ -116,18 +116,17 @@ public class MpMessageServiceImpl implements MpMessageService {
         WxMpKefuMessage wxMessage = MpMessageConvert.INSTANCE.convert(sendReqVO, user);
         WxMpService mpService = mpServiceFactory.getRequiredMpService(user.getAppId());
         try {
-            boolean result = mpService.getKefuService().sendKefuMessage(wxMessage);
-            System.out.println(result);
+            mpService.getKefuService().sendKefuMessageWithResponse(wxMessage);
         } catch (WxErrorException e) {
             throw new RuntimeException(e);
         }
 
         // 记录消息
         MpMessageDO message = MpMessageConvert.INSTANCE.convert(wxMessage, account, user);
-        message.setSendFrom(MpMessageSendFromEnum.USER_TO_MP.getFrom());
+        message.setSendFrom(MpMessageSendFromEnum.MP_TO_USER.getFrom());
         downloadMessageMedia(mpService, message);
         mpMessageMapper.insert(message);
-        return message.getId();
+        return message;
     }
 
     /**
diff --git a/yudao-ui-admin/src/api/mp/message.js b/yudao-ui-admin/src/api/mp/message.js
index 2eef1a044..022f9a876 100644
--- a/yudao-ui-admin/src/api/mp/message.js
+++ b/yudao-ui-admin/src/api/mp/message.js
@@ -1,23 +1,6 @@
 import request from '@/utils/request'
 
-// 创建粉丝消息表
-export function createMessage(data) {
-  return request({
-    url: '/mp/message/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 获得粉丝消息表
-export function getMessage(id) {
-  return request({
-    url: '/mp/message/get?id=' + id,
-    method: 'get'
-  })
-}
-
-// 获得粉丝消息表 分页
+// 获得粉丝消息表分页
 export function getMessagePage(query) {
   return request({
     url: '/mp/message/page',
@@ -25,3 +8,12 @@ export function getMessagePage(query) {
     params: query
   })
 }
+
+// 给粉丝发送消息
+export function sendMessage(data) {
+  return request({
+    url: '/mp/message/send',
+    method: 'post',
+    data: data
+  })
+}
diff --git a/yudao-ui-admin/src/views/mp/components/wx-msg/main.vue b/yudao-ui-admin/src/views/mp/components/wx-msg/main.vue
index 72daaac91..4dd3d1f25 100644
--- a/yudao-ui-admin/src/views/mp/components/wx-msg/main.vue
+++ b/yudao-ui-admin/src/views/mp/components/wx-msg/main.vue
@@ -88,7 +88,7 @@
 </template>
 
 <script>
-  import { getMessagePage } from '@/api/mp/message'
+import {getMessagePage, sendMessage} from '@/api/mp/message'
   import WxReplySelect from '@/views/mp/components/wx-reply/main.vue'
   import WxVideoPlayer from '@/views/mp/components/wx-video-play/main.vue';
   import WxVoicePlayer from '@/views/mp/components/wx-voice-play/main.vue';
@@ -107,16 +107,14 @@
       WxMusic
     },
     props: {
-      wxUserId: {
-        type: String
+      userId: {
+        type: String,
+        required: true
       }
     },
     data() {
       return {
         nowStr: new Date().getTime(), // 当前的时间戳，用于每次消息加载后，回到原位置；具体见 :id="'msg-div' + nowStr" 处
-        objData:{
-          repType: 'text'
-        },
         sendLoading: false, // 发送消息是否加载中
         tableLoading: false, // 消息列表是否正在加载中
         loadMore: true, // 是否可以加载更多
@@ -133,6 +131,9 @@
           nickname: '公众号',
           avatar: require("@/assets/images/wechat.png"),
         },
+        objData:{ // 微信发送消息
+          repType: 'text'
+        },
       }
     },
     created() {
@@ -140,30 +141,37 @@
     },
     methods:{
       sendMsg(){
-        if (this.objData) {
-          if(this.objData.repType === 'news'){
-            this.objData.content.articles = [this.objData.content.articles[0]]
-            this.$message({
-              showClose: true,
-              message: '图文消息条数限制在1条以内，已默认发送第一条',
-              type: 'success'
-            })
-          }
-          this.sendLoading = true
-          addObj(Object.assign({
-            wxUserId: this.wxUserId
-          },this.objData)).then(data => {
-            this.sendLoading = false
-            data = data.data
-            this.tableData = [...this.tableData , ...[data] ]
-            this.scrollToBottom()
-            this.objData = {
-              repType: 'text'
-            }
-          }).catch(() => {
-            this.sendLoading = false
+        if (!this.objData) {
+          return;
+        }
+        if (this.objData.repType === 'news') {
+          this.objData.content.articles = [this.objData.content.articles[0]]
+          this.$message({
+            showClose: true,
+            message: '图文消息条数限制在1条以内，已默认发送第一条',
+            type: 'success'
           })
         }
+        this.sendLoading = true
+        sendMessage(Object.assign({
+          userId: this.userId
+        }, {
+          ...this.objData,
+          type: this.objData.repType,
+          content: this.objData.repContent,
+          // TODO 芋艿：临时适配，保证可用
+        })).then(response => {
+          this.sendLoading = false
+          // 添加到消息列表，并滚动
+          this.tableData = [...this.tableData , ...[response.data] ]
+          this.scrollToBottom()
+          // 重置 objData 状态
+          this.objData = {
+            repType: 'text'
+          }
+        }).catch(() => {
+          this.sendLoading = false
+        })
       },
       loadingMore() {
         this.page.pageNo++
@@ -174,7 +182,7 @@
         getMessagePage(Object.assign({
           pageNo: page.pageNo,
           pageSize: page.pageSize,
-          wxUserId: this.wxUserId
+          userId: this.userId
         }, params)).then(response => {
           // 计算当前的滚动高度
           const msgDiv = document.getElementById('msg-div' + this.nowStr);
diff --git a/yudao-ui-admin/src/views/mp/message/index.vue b/yudao-ui-admin/src/views/mp/message/index.vue
index 938efc5d8..e8d630624 100644
--- a/yudao-ui-admin/src/views/mp/message/index.vue
+++ b/yudao-ui-admin/src/views/mp/message/index.vue
@@ -111,7 +111,7 @@
                 @pagination="getList"/>
 
     <el-dialog title="用户消息" :visible.sync="open" width="40%">
-      <wx-msg wxUserId="1" v-if="true" />
+      <wx-msg user-id="3" v-if="true" />
     </el-dialog>
 
   </div>