| 
						
						
							
								
							
						
						
					 | 
				
				 | 
				
					@ -34,6 +34,7 @@ import com.epmet.constant.ReadFlagConstant; | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					import com.epmet.dto.form.UserMessageFormDTO; | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					import com.epmet.dto.form.UserResiInfoFormDTO; | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					import com.epmet.dto.form.UserResiInfoListFormDTO; | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					import com.epmet.dto.form.WxSubscribeMessageFormDTO; | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					import com.epmet.dto.result.UserResiInfoResultDTO; | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					import com.epmet.feign.EpmetMessageOpenFeignClient; | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					import com.epmet.modules.constant.GroupMemberConstant; | 
				
			
			
		
	
	
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
				
				 | 
				
					@ -435,7 +436,7 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
						 * @return void | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
						 * @param resiGroupMemberDTO | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
						 * @Author yinzuomei | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
						 * @Description 用户会收到:您有一条小组消息。  您加入的【组名】已通过审核,请查看。 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
						 * @Description 用户会收到:您有一条小组消息。  您加入的【组名】已通过审核,请查看。发送微信订阅通知 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
						 * @Date 2020/4/7 15:39 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
						 **/ | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
						private void sendUserApprovedMessage(ResiGroupMemberDTO resiGroupMemberDTO) { | 
				
			
			
		
	
	
		
			
				
					| 
						
						
						
							
								
							
						
					 | 
				
				 | 
				
					@ -452,6 +453,16 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							//通知群主
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							userMessage.setUserId(resiGroupMemberDTO.getCustomerUserId()); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							epmetMessageOpenFeignClient.saveUserMessage(userMessage); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							//2 给用户发送微信订阅
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							WxSubscribeMessageFormDTO wxSubscribeMessageFormDTO = new WxSubscribeMessageFormDTO(); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							wxSubscribeMessageFormDTO.setCustomerId(resiGroupMemberDTO.getCustomerId()); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							wxSubscribeMessageFormDTO.setUserId(resiGroupMemberDTO.getCustomerUserId()); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							wxSubscribeMessageFormDTO.setClientType(AppClientConstant.APP_RESI); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							wxSubscribeMessageFormDTO.setBehaviorType(UserMessageConstant.WX_APPLY_GROUP_BEHAVIOR); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							wxSubscribeMessageFormDTO.setMessageContent(messageContent); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							List<WxSubscribeMessageFormDTO> msgList = new ArrayList<>(); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							msgList.add(wxSubscribeMessageFormDTO); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							epmetMessageOpenFeignClient.sendWxSubscribeMessage(msgList); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
						} | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
						/** | 
				
			
			
		
	
	
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
				
				 | 
				
					@ -500,7 +511,7 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
						 * @param groupMemeberOperationDTO | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
						 * @param disagreeApplyFormDTO | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
						 * @Author yinzuomei | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
						 * @Description 您在【组名】的入组申请被拒绝。原因:【组长拒绝审核时输入的备注】 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
						 * @Description 您在【组名】的入组申请被拒绝。原因:【组长拒绝审核时输入的备注】; 发送微信订阅 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
						 * @Date 2020/4/7 15:39 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
						 **/ | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
						private void sendUserRejectedMessage(GroupMemeberOperationDTO groupMemeberOperationDTO,DisagreeApplyFormDTO disagreeApplyFormDTO) { | 
				
			
			
		
	
	
		
			
				
					| 
						
						
						
							
								
							
						
					 | 
				
				 | 
				
					@ -517,6 +528,16 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							//通知群主
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							userMessage.setUserId(groupMemeberOperationDTO.getCustomerUserId()); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							epmetMessageOpenFeignClient.saveUserMessage(userMessage); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							//2 给用户发送微信订阅
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							WxSubscribeMessageFormDTO wxSubscribeMessageFormDTO = new WxSubscribeMessageFormDTO(); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							wxSubscribeMessageFormDTO.setCustomerId(resiGroupDTO.getCustomerId()); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							wxSubscribeMessageFormDTO.setUserId(groupMemeberOperationDTO.getCustomerUserId()); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							wxSubscribeMessageFormDTO.setClientType(AppClientConstant.APP_RESI); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							wxSubscribeMessageFormDTO.setBehaviorType(UserMessageConstant.WX_APPLY_GROUP_BEHAVIOR); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							wxSubscribeMessageFormDTO.setMessageContent(messageContent); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							List<WxSubscribeMessageFormDTO> msgList = new ArrayList<>(); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							msgList.add(wxSubscribeMessageFormDTO); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							epmetMessageOpenFeignClient.sendWxSubscribeMessage(msgList); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
						} | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					    /** | 
				
			
			
		
	
	
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
				
				 | 
				
					
  |