Merge branch 'feature/xgh/zq12' into 'master'

入群通知

See merge request !2401

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/chat/impl/GroupChatServiceImpl.java

@@ -1014,17 +1014,16 @@ public class GroupChatServiceImpl implements GroupChatService {
 
 
     public void notice(String enterpriseId,String memberId , int addOrQuit) {
-        logger.info("会员群发退群通知={}",memberId,addOrQuit);
+        logger.info("会员群入群通知={},{}",memberId,addOrQuit,addOrQuit);
         if(StringUtils.isBlank(enterpriseId) || StringUtils.isBlank(memberId)) {
             return;
         }
-        JSONObject json  = new JSONObject() ;
         GroupChatUserNoticeDTO dto = new GroupChatUserNoticeDTO() ;
         dto.setEnterpriseId(enterpriseId);
         dto.setMemberId(memberId);
         dto.setAddOrQuit(addOrQuit);
         try {
-            mqClient.sendMessage("qywxAddGroupChatEvent", json.toJSONString());
+            mqClient.sendMessage("qywxAddGroupChatEvent",JSONObject.toJSONString(dto));
         } catch (Exception e) {
             throw new RuntimeException(e);
         }