Merge branch 'upay-test' into 'upay-prod'

Upay test

See merge request !24

common/src/main/java/com/wecloud/im/vo/MyConversationListVo.java

@@ -52,6 +52,9 @@ public class MyConversationListVo implements Serializable {
     @ApiModelProperty("成员")
     private String members;
 
+    @ApiModelProperty("成员数量")
+    private Integer memberCount;
+
     @ApiModelProperty("会话最后一条消息")
     private OfflineMsgDto lastMsg;
 

common/src/main/resources/mapper/ImConversationMapper.xml

@@ -37,7 +37,10 @@
                    FROM im_conversation_members AS im_conversation_members
                             INNER JOIN im_client AS im_client ON im_client.id = im_conversation_members.fk_client_id
                    WHERE im_conversation_members.fk_conversation_id = imConversation.id
-               )                                    AS members
+               )                                    AS members,
+               (SELECT COUNT(*)
+                FROM im_conversation_members
+                WHERE fk_conversation_id = imConversation.id) AS memberCount
         FROM im_conversation_members AS imConversationMembers
                  INNER JOIN im_conversation AS imConversation
                             ON imConversation.id = imConversationMembers.fk_conversation_id