diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/constant/UserMessageConstant.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/constant/UserMessageConstant.java index 880efbac70..d7da80088c 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/constant/UserMessageConstant.java +++ b/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,已审核通过。"; /** * 审核建组申请消息名称 diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java index bb02b51d0d..606eb75fbe 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java +++ b/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.UserInvitationFormDTO; -import com.epmet.dto.form.UserMessageFormDTO; -import com.epmet.dto.form.UserResiInfoFormDTO; +import com.epmet.dto.form.*; 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 msgList = new ArrayList<>(); + msgList.add(wxSubscribeMessageFormDTO); + epmetMessageOpenFeignClient.sendWxSubscribeMessage(msgList); if (result.success()) { logger.info("通知群主有新成员入群成功"); } else { diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java index 9b65fd0ddf..318989299c 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java +++ b/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 msgList = new ArrayList<>(); msgList.add(wxSubscribeMessageFormDTO); diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberMessageConstant.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberMessageConstant.java index 7e22178bec..86223a328c 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberMessageConstant.java +++ b/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 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/constant/ResiWarmUserMessageConstant.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/constant/ResiWarmUserMessageConstant.java index 13e1231a2a..1f7b6d6959 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/constant/ResiWarmUserMessageConstant.java +++ b/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