From 3eeffaab90197ea01ee66d2f4190026d665093b3 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 10 Sep 2021 16:08:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8Bkey?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../constant/UserMessageTypeConstant.java | 20 ++++++++++++------- .../service/impl/ResiGroupServiceImpl.java | 6 +++--- .../impl/GroupInvitationServiceImpl.java | 2 +- .../impl/ResiGroupMemberServiceImpl.java | 6 +++--- .../impl/PartyMemberConfirmServiceImpl.java | 4 ++-- 5 files changed, 22 insertions(+), 16 deletions(-) diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java index da42eb0290..38fce38af4 100644 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java @@ -25,45 +25,51 @@ public interface UserMessageTypeConstant { */ String WARMHEARTED_APPLY_RES="warmhearted_apply_res"; + /** * 居民端认证党员时，补充信息填写完成提交后，通知网格长，人工审核党员申请 * targetId:partymember_info.id */ - String CERTIFY_PARTY_APPLY="certify_party_apply"; + String PARTY_CERTIFY_APPLY="party_certify_apply"; /** * 工作端审核居民是否是党员，通知居民。 * targetId:partymember_info.id */ - String CERTIFY_PARTY_APPLY_RES="certify_party_apply_res"; + String PARTY_CERTIFY_APPLY_RES="party_certify_apply_res"; + + /** * 居民端用户申请创建小组，提交小组信息后，通知网格长 * targetId:resi_group.id */ - String CREATE_GROUP_APPLY="create_group_apply"; + String GROUP_CREATE_GROUP_APPLY="group_create_group_apply"; /** * 工作端审核建群申请后，通知建组人结果 * targetId:resi_group.id */ - String CREATE_GROUP_APPLY_RES="create_group_apply_res"; + String GROUP_CREATE_GROUP_RES="group_create_group_res"; /** * 居民单申请入群，通知组长审核 * targetId:resi_group.id */ - String APPLY_ENTER_GROUP="apply_enter_group"; + String GROUP_APPLY_ENTER="group_apply_enter"; /** * 组长审核完入群申请，通知居民结果 * targetId:resi_group.id */ - String APPLY_ENTER_GROUP_RES="apply_enter_group_res"; + String GROUP_APPLY_ENTER_RES="group_apply_enter_res"; /** * 组员通过连接自动入组的，通知组长 * targetId:resi_group.id */ - String ENTER_GROUP_BY_LINK_RES="enter_group_by_link_res"; + String GROUP_ENTER_GROUP_BY_LINK_RES="group_enter_group_by_link_res"; + + + } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java index 1ec41e6060..57d34c83b6 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java @@ -721,7 +721,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl