From 07d94887f2c5cdad6f52a35febe07f0d591ad5a6 Mon Sep 17 00:00:00 2001
From: liuchuang <m18800112042_2@163.com>
Date: Wed, 6 Nov 2019 10:58:41 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A4=BE=E7=BE=A4=E6=B7=BB=E5=8A=A0=E5=A5=BD?=
 =?UTF-8?q?=E5=8F=8B=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/constant/GroupNoticeConstant.java     | 15 ++++++++++
 .../service/impl/UserGroupServiceImpl.java    | 30 ++++++++++++++++++-
 .../dto/epdc/form/EpdcInformationFormDTO.java |  2 +-
 3 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/constant/GroupNoticeConstant.java b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/constant/GroupNoticeConstant.java
index 65e19c473..f0d0e7f21 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/constant/GroupNoticeConstant.java
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/constant/GroupNoticeConstant.java
@@ -29,6 +29,16 @@ public interface GroupNoticeConstant {
      */
     String NOTICE_GROUP_REMOVED_MEMBER = "你已被群主移除社群";
 
+    /**
+     * 邀请入群
+     */
+    String NOTICE_GROUP_INVITED = "您已加入社群";
+
+    /**
+     * 邀请入群内容
+     */
+    String NOTICE_GROUP_INVITED_CONTENT = "您已被群主邀请加入groupName社群，快进入社群看看吧。";
+
     /**
      * 退出社群
      */
@@ -73,4 +83,9 @@ public interface GroupNoticeConstant {
      * 消息所属业务类型：退出社群
      */
     String NOTICE_BUSINESS_TYPE_GROUP_QUIT = "groupQuit";
+
+    /**
+     * 社群邀请
+     */
+    String NOTICE_BUSINESS_TYPE_GROUP_INVITED = "groupInvited";
 }
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/UserGroupServiceImpl.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/UserGroupServiceImpl.java
index 2df76c7f5..783b429ff 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/UserGroupServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/UserGroupServiceImpl.java
@@ -25,17 +25,22 @@ import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.constant.GroupNoticeConstant;
 import com.elink.esua.epdc.dto.enums.GroupUserStateEnum;
+import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO;
+import com.elink.esua.epdc.dto.group.GroupDTO;
 import com.elink.esua.epdc.dto.group.UserGroupDTO;
 import com.elink.esua.epdc.dto.group.form.GroupAddUserFormDTO;
 import com.elink.esua.epdc.dto.group.form.GroupUserFormDTO;
 import com.elink.esua.epdc.dto.group.form.GroupUserRemoveOrQuitFormDTO;
 import com.elink.esua.epdc.dto.group.result.GroupUserListResultDTO;
+import com.elink.esua.epdc.modules.async.NewsTask;
 import com.elink.esua.epdc.modules.feign.UserFeignClient;
 import com.elink.esua.epdc.modules.group.dao.UserGroupDao;
 import com.elink.esua.epdc.modules.group.entity.UserGroupEntity;
+import com.elink.esua.epdc.modules.group.service.GroupService;
 import com.elink.esua.epdc.modules.group.service.UserGroupService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -59,6 +64,12 @@ public class UserGroupServiceImpl extends BaseServiceImpl<UserGroupDao, UserGrou
     @Autowired
     private UserFeignClient userFeignClient;
 
+    @Autowired
+    private GroupService groupService;
+
+    @Autowired
+    private NewsTask newsTask;
+
     @Override
     public PageData<UserGroupDTO> page(Map<String, Object> params) {
         IPage<UserGroupDTO> page = getPage(params);
@@ -156,11 +167,28 @@ public class UserGroupServiceImpl extends BaseServiceImpl<UserGroupDao, UserGrou
             entity.setMobile(userDto.getMobile());
             entity.setPartyMember(userDto.getPartyMember());
             entity.setLordFlag(NumConstant.ZERO_STR);
-            entity.setState(GroupUserStateEnum.GROUP_USER_STATE_PENDING_REVIEW.getValue());
+            entity.setState(GroupUserStateEnum.GROUP_USER_STATE_EXAMINATION_PASSED.getValue());
 
             userGroupEntities.add(entity);
         }
+
+        // 获取社群信息
+        GroupDTO groupDto = groupService.get(formDto.getGroupId());
+        // 组装发送消息内容
         if (insertBatch(userGroupEntities)) {
+            for (UserGroupEntity userGroupEntity:
+                    userGroupEntities) {
+                EpdcInformationFormDTO informationFormDTO = new EpdcInformationFormDTO();
+                informationFormDTO.setContent(GroupNoticeConstant.NOTICE_GROUP_INVITED_CONTENT.replace("groupName", groupDto.getGroupName()));
+                informationFormDTO.setType(GroupNoticeConstant.NOTICE_TYPE_GROUP_NOTICE);
+                informationFormDTO.setBusinessId(formDto.getGroupId());
+                informationFormDTO.setUserId(userGroupEntity.getUserId());
+                informationFormDTO.setTitle(GroupNoticeConstant.NOTICE_GROUP_INVITED);
+                informationFormDTO.setBusinessType(GroupNoticeConstant.NOTICE_BUSINESS_TYPE_GROUP_INVITED);
+
+                // 发送通知
+                newsTask.insertUserInformation(informationFormDTO);
+            }
             return new Result();
         }
 
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcInformationFormDTO.java b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcInformationFormDTO.java
index f163843ba..17428cd70 100644
--- a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcInformationFormDTO.java
+++ b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcInformationFormDTO.java
@@ -64,7 +64,7 @@ public class EpdcInformationFormDTO implements Serializable {
      * 消息所属业务类型：event事件审核；issueComment议题评论；issueReply议题评论回复；itemComment项目评论；itemReply项目评论回复；
      *                  issueApprove支持议题；itemApprove支持项目；issueCommentApprove议题评论支持；issueCommentOppose议题评论反对；
      *                  itemCommentApprove项目评论支持；itemCommentOppose项目评论反对；issue议题处理；
-     *                  item项目处理；crowd社群邀请等
+     *                  item项目处理；groupInvited社群邀请等
      */
     @NotBlank(message = "消息所属业务类型不能为空")
     private String businessType;