Merge branch 'dev_wx_msg' into dev_temp

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/constant/UserMessageConstant.java

@@ -37,12 +37,12 @@ public interface UserMessageConstant {
     /**
      * 建组审核驳回时消息模板
      * */
-    String DISAGREE_CREATING_GROUP_MSG_TEMPLATE = "您好，您申请的%s，已被驳回，原因：%s。";
+    String DISAGREE_CREATING_GROUP_MSG_TEMPLATE = "您申请的%s，已被驳回，原因：%s。";
 
     /**
      * 建组审核同意时消息模板
      * */
-    String AGREE_CREATING_GROUP_MSG_TEMPLATE = "您好，您申请的%s，已审核通过。";
+    String AGREE_CREATING_GROUP_MSG_TEMPLATE = "您申请的%s，已审核通过。";
 
     /**
      * 审核建组申请消息名称

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java

@@ -28,10 +28,7 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.ReadFlagConstant;
-import com.epmet.dto.form.UserEnterGridFormDTO;
+import com.epmet.dto.form.*;
-import com.epmet.dto.form.UserInvitationFormDTO;
-import com.epmet.dto.form.UserMessageFormDTO;
-import com.epmet.dto.form.UserResiInfoFormDTO;
 import com.epmet.dto.result.UserInfoOnEnterGridResultDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.feign.EpmetMessageOpenFeignClient;
@@ -438,6 +435,18 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		//通知群主
 		userMessage.setUserId(groupInvitationDTO.getInviterUserId());
 		Result result = epmetMessageOpenFeignClient.saveUserMessage(userMessage);
+		//发送微信订阅消息
+		WxSubscribeMessageFormDTO wxSubscribeMessageFormDTO = new WxSubscribeMessageFormDTO();
+		wxSubscribeMessageFormDTO.setCustomerId(resiGroupDTO.getCustomerId());
+		wxSubscribeMessageFormDTO.setUserId(groupInvitationDTO.getInviterUserId());
+		wxSubscribeMessageFormDTO.setClientType(AppClientConstant.APP_RESI);
+		wxSubscribeMessageFormDTO.setGridId(resiGroupDTO.getGridId());
+		wxSubscribeMessageFormDTO.setBehaviorType(UserMessageConstant.WX_APPLY_JOIN_GROUP_BEHAVIOR);
+		wxSubscribeMessageFormDTO.setMessageContent(messageContent);
+		wxSubscribeMessageFormDTO.setMessageTime(new Date());
+		List<WxSubscribeMessageFormDTO> msgList = new ArrayList<>();
+		msgList.add(wxSubscribeMessageFormDTO);
+		epmetMessageOpenFeignClient.sendWxSubscribeMessage(msgList);
 		if (result.success()) {
 			logger.info("通知群主有新成员入群成功");
 		} else {

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java

@@ -277,7 +277,7 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 			subscribeDTO.setClientType(ModuleConstant.APP_RESI);
 			subscribeDTO.setGridId(resiGroupDTO.getGridId());
 			subscribeDTO.setCustomerId(resiGroupDTO.getCustomerId());
-			subscribeDTO.setUserId(currentUserId);
+			subscribeDTO.setUserId(groupLeader.getCustomerUserId());
 			subscribeDTO.setBehaviorType(UserMessageConstant.WX_APPLY_JOIN_GROUP_BEHAVIOR);
 			subscribeDTO.setMessageContent(messageContent);
 			subscribeDTO.setMessageTime(new Date());
@@ -468,7 +468,7 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		epmetMessageOpenFeignClient.saveUserMessage(userMessage);
 		//2 给用户发送微信订阅
 		WxSubscribeMessageFormDTO wxSubscribeMessageFormDTO = new WxSubscribeMessageFormDTO();
-		wxSubscribeMessageFormDTO.setCustomerId(resiGroupMemberDTO.getCustomerId());
+		wxSubscribeMessageFormDTO.setCustomerId(resiGroupDTO.getCustomerId());
 		wxSubscribeMessageFormDTO.setUserId(resiGroupMemberDTO.getCustomerUserId());
 		wxSubscribeMessageFormDTO.setClientType(AppClientConstant.APP_RESI);
 		wxSubscribeMessageFormDTO.setGridId(resiGroupDTO.getGridId());
@@ -550,6 +550,7 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		wxSubscribeMessageFormDTO.setClientType(AppClientConstant.APP_RESI);
 		wxSubscribeMessageFormDTO.setGridId(resiGroupDTO.getGridId());
 		wxSubscribeMessageFormDTO.setBehaviorType(UserMessageConstant.WX_APPLY_JOIN_GROUP_BEHAVIOR);
+		wxSubscribeMessageFormDTO.setMessageTime(new Date());
 		wxSubscribeMessageFormDTO.setMessageContent(messageContent);
 		List<WxSubscribeMessageFormDTO> msgList = new ArrayList<>();
 		msgList.add(wxSubscribeMessageFormDTO);

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberMessageConstant.java

@@ -19,12 +19,12 @@ public interface PartyMemberMessageConstant {
 	/**
 	 * 党员申请审核通过给申请人发送消息：您好，您申请的党员已审核通过，请查看。
 	 */
-	String AUDIT_APPROVE_MSG = "您好，您申请的%s党员已审核通过，请查看。";
+	String AUDIT_APPROVE_MSG = "您申请的%s党员已审核通过，请查看。";
 
 	/**
 	 * 党员申请审核驳回给申请人发送消息：您好，您申请的党员，由于不符合条件的原因，已被驳回。
 	 */
-	String AUDIT_REJECT_MSG = "您好，您申请的%s党员，由于不符合条件的原因，已被驳回。";
+	String AUDIT_REJECT_MSG = "您申请的%s党员，由于不符合条件的原因，已被驳回。";
 
 	/**
 	 * 党员申请behavior

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/constant/ResiWarmUserMessageConstant.java

@@ -19,12 +19,12 @@ public interface ResiWarmUserMessageConstant {
     /**
      * 热心居民申请审核通过给申请人发送消息：您好，您申请的第三网格热心居民已审核通过，请查看。
      */
-    String AUDIT_APPROVE_MSG = "您好，您申请的%s热心居民已审核通过，请查看。";
+    String AUDIT_APPROVE_MSG = "您申请的%s热心居民已审核通过，请查看。";
 
     /**
      * 热心居民申请审核驳回给申请人发送消息：您好，您申请的第三网格热心居民，已被驳回，原因：不符合要求。
      */
-    String AUDIT_REJECT_MSG = "您好，您申请的%s热心居民，已被驳回，原因：%s";
+    String AUDIT_REJECT_MSG = "您申请的%s热心居民，已被驳回，原因：%s";
 
     /**
      * 热心居民申请-微信订阅behavior