|
|
@ -41,7 +41,10 @@ import com.epmet.dto.result.UserBaseInfoResultDTO; |
|
|
|
import com.epmet.feign.EpmetMessageOpenFeignClient; |
|
|
|
import com.epmet.feign.EpmetUserOpenFeignClient; |
|
|
|
import com.epmet.feign.GovOrgOpenFeignClient; |
|
|
|
import com.epmet.modules.act.dao.*; |
|
|
|
import com.epmet.modules.act.dao.ActOperationRecordDao; |
|
|
|
import com.epmet.modules.act.dao.ActReadRecordDao; |
|
|
|
import com.epmet.modules.act.dao.GroupActContentDao; |
|
|
|
import com.epmet.modules.act.dao.GroupActInfoDao; |
|
|
|
import com.epmet.modules.act.entity.*; |
|
|
|
import com.epmet.modules.act.service.ActCategoryDictService; |
|
|
|
import com.epmet.modules.act.service.ActSignInRecordService; |
|
|
@ -49,6 +52,7 @@ import com.epmet.modules.act.service.ActSummaryService; |
|
|
|
import com.epmet.modules.act.service.GroupActInfoService; |
|
|
|
import com.epmet.modules.constant.GroupActConstant; |
|
|
|
import com.epmet.modules.constant.UserMessageConstant; |
|
|
|
import com.epmet.modules.group.service.GroupMessageService; |
|
|
|
import com.epmet.modules.group.service.ResiGroupService; |
|
|
|
import com.epmet.modules.invitation.service.InvitationRecordService; |
|
|
|
import com.epmet.modules.member.service.ResiGroupMemberService; |
|
|
@ -57,6 +61,7 @@ import com.epmet.resi.group.dto.act.GroupActInfoDTO; |
|
|
|
import com.epmet.resi.group.dto.act.form.*; |
|
|
|
import com.epmet.resi.group.dto.act.result.ActDetailByLinkResultDTO; |
|
|
|
import com.epmet.resi.group.dto.act.result.ActDetailResultDTO; |
|
|
|
import com.epmet.resi.group.dto.group.GroupMessageDTO; |
|
|
|
import com.epmet.resi.group.dto.group.ResiGroupDTO; |
|
|
|
import com.epmet.resi.group.dto.invitation.InvitationRecordDTO; |
|
|
|
import com.epmet.resi.group.dto.member.ResiGroupMemberDTO; |
|
|
@ -115,6 +120,9 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr |
|
|
|
private InvitationRecordService invitationRecordService; |
|
|
|
@Autowired |
|
|
|
private ActSummaryService actSummaryService; |
|
|
|
@Autowired |
|
|
|
private GroupMessageService groupMessageService; |
|
|
|
|
|
|
|
/** |
|
|
|
* 003、发布(编辑)组织活动 |
|
|
|
* |
|
|
@ -175,10 +183,38 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr |
|
|
|
//5、发送站内信
|
|
|
|
sendMessage(memberDTOList,formDTO,groupActInfoEntity,groupDTO); |
|
|
|
|
|
|
|
//6、插入或更新历史关系表
|
|
|
|
saveGroupMessage(groupActInfoEntity); |
|
|
|
|
|
|
|
result.setGroupActId(groupActInfoEntity.getId()); |
|
|
|
return result; |
|
|
|
} |
|
|
|
|
|
|
|
private void saveGroupMessage(GroupActInfoEntity groupActInfoEntity) { |
|
|
|
GroupMessageDTO groupMessageDTO=groupMessageService.getByMessageId(groupActInfoEntity.getId()); |
|
|
|
if(null==groupMessageDTO){ |
|
|
|
GroupMessageDTO insert=new GroupMessageDTO(); |
|
|
|
insert.setCustomerId(groupActInfoEntity.getCustomerId()); |
|
|
|
insert.setGridId(groupActInfoEntity.getGridId()); |
|
|
|
if(GroupActConstant.CANCELED.equals(groupActInfoEntity.getStatus())){ |
|
|
|
insert.setOperateTime(groupActInfoEntity.getCanceledTime()); |
|
|
|
}else if(GroupActConstant.CLOSED.equals(groupActInfoEntity.getStatus())){ |
|
|
|
insert.setOperateTime(groupActInfoEntity.getClosedTime()); |
|
|
|
}else{ |
|
|
|
insert.setOperateTime(groupActInfoEntity.getUpdatedTime()); |
|
|
|
} |
|
|
|
insert.setStatus(groupActInfoEntity.getStatus()); |
|
|
|
insert.setMessageId(insert.getId()); |
|
|
|
insert.setType("act"); |
|
|
|
insert.setPublishUserId(groupActInfoEntity.getPublishUserId()); |
|
|
|
groupMessageService.save(insert); |
|
|
|
return; |
|
|
|
} |
|
|
|
groupMessageDTO.setOperateTime(groupActInfoEntity.getUpdatedTime()); |
|
|
|
groupMessageDTO.setStatus(groupActInfoEntity.getStatus()); |
|
|
|
groupMessageService.update(groupMessageDTO); |
|
|
|
} |
|
|
|
|
|
|
|
private void sendMessage(List<ResiGroupMemberDTO> memberDTOList, PublishGroupActFormDTO formDTO, GroupActInfoEntity groupActInfoEntity,ResiGroupDTO resiGroupDTO) { |
|
|
|
|
|
|
|
List<UserMessageFormDTO> list = new ArrayList<>(); |
|
|
@ -637,6 +673,8 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr |
|
|
|
//6、发送站内信
|
|
|
|
sendUserMessageForCancelAct(actInfoEntity,formDTO.getUserId()); |
|
|
|
|
|
|
|
//7、插入或更新消息表
|
|
|
|
saveGroupMessage(actInfoEntity); |
|
|
|
GroupActIdDTO resultDTO=new GroupActIdDTO(); |
|
|
|
resultDTO.setGroupActId(formDTO.getGroupActId()); |
|
|
|
return resultDTO; |
|
|
@ -743,5 +781,8 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr |
|
|
|
actInfoEntity.setStatus(GroupActConstant.CLOSED); |
|
|
|
actInfoEntity.setClosedTime(actOperationRecordEntity.getCreatedTime()); |
|
|
|
baseDao.updateById(actInfoEntity); |
|
|
|
|
|
|
|
//6、插入或更新
|
|
|
|
saveGroupMessage(actInfoEntity); |
|
|
|
} |
|
|
|
} |