diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.10__add_colum_to_share_link_visit.sql b/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.10__add_colum_to_share_link_visit.sql new file mode 100644 index 0000000000..5182855cb5 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.10__add_colum_to_share_link_visit.sql @@ -0,0 +1,2 @@ +ALTER TABLE `issue_share_link_visit_record` +ADD COLUMN `IF_JOIN_GROUP` tinyint(1) DEFAULT '0' COMMENT '是否同意进组,1是0否,在注册完居民之后,是否同意入组,如果同意发送入组申请,不同意此项默认为0'; diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupMemeberOperationServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupMemeberOperationServiceImpl.java index 67a74321bf..60a9c6c76e 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupMemeberOperationServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupMemeberOperationServiceImpl.java @@ -48,6 +48,7 @@ import com.epmet.modules.member.dao.ResiGroupMemberDao; import com.epmet.modules.member.entity.GroupMemeberOperationEntity; import com.epmet.modules.member.entity.ResiGroupMemberEntity; import com.epmet.modules.member.redis.GroupMemeberOperationRedis; +import com.epmet.modules.member.redis.ResiGroupMemberRedis; import com.epmet.modules.member.service.GroupMemeberOperationService; import com.epmet.modules.member.service.ResiGroupMemberService; import com.epmet.modules.topic.dao.ResiTopicDao; @@ -64,6 +65,7 @@ import com.epmet.resi.group.dto.group.ResiGroupDTO; import com.epmet.resi.group.dto.group.ResiGroupInfoRedisDTO; import com.epmet.resi.group.dto.member.GroupMemeberOperationDTO; import com.epmet.resi.group.dto.member.ResiGroupMemberDTO; +import com.epmet.resi.group.dto.member.ResiGroupMemberInfoRedisDTO; import com.epmet.resi.group.dto.member.form.JoinGroupByShareLinkFormDTO; import com.epmet.resi.group.dto.member.form.RemoveMemberFormDTO; import com.epmet.resi.group.dto.member.result.JoinGroupApplyRealTimeResultDTO; @@ -107,6 +109,8 @@ public class GroupMemeberOperationServiceImpl extends BaseServiceImpl