From f7bb2826dad63b75879707159ddec6a1fb8a7189 Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Fri, 19 Jan 2024 11:49:15 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=AE=8C=E5=96=84=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=EF=BC=8C=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF=E7=BB=99?= =?UTF-8?q?=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/enums/MessageTypeEnum.java | 3 ++- .../enums/WxUserIntegralMessageTypeEnum.java | 5 +++-- .../service/impl/WxUserMemberServiceImpl.java | 18 ++++++++++++++++++ flossom-ui/src/views/system/member/index.vue | 2 ++ .../src/views/system/scriptMessage/index.vue | 2 ++ 5 files changed, 27 insertions(+), 3 deletions(-) diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/enums/MessageTypeEnum.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/enums/MessageTypeEnum.java index 737ff61..581200b 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/enums/MessageTypeEnum.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/enums/MessageTypeEnum.java @@ -9,7 +9,8 @@ public enum MessageTypeEnum { USER_REGISTRATION(1, "用户注册"), SUBMIT_MESSAGE(2, "提交留言"), - BINDING_INSTRUMENTS(3, "绑定仪器"); + BINDING_INSTRUMENTS(3, "绑定仪器"), + COMPLETE_USER_INFORMATION(4, "完善用户信息"); private final Integer code; private final String info; diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/enums/WxUserIntegralMessageTypeEnum.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/enums/WxUserIntegralMessageTypeEnum.java index 8891ee6..a31b142 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/enums/WxUserIntegralMessageTypeEnum.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/enums/WxUserIntegralMessageTypeEnum.java @@ -3,7 +3,7 @@ package com.flossom.common.core.enums; /** * wx_user_script_log *

- * 消息类型:0、未知,1、用户注册,2、绑定仪器,3、打卡活动,4、护理计划,5、问卷活动,6、会员管理,7、消息模板 + * 消息类型:0、未知,1、用户注册,2、绑定仪器,3、打卡活动,4、护理计划,5、问卷活动,6、会员管理,7、消息模板,8、留言,9、完善用户信息 */ public enum WxUserIntegralMessageTypeEnum { @@ -15,7 +15,8 @@ public enum WxUserIntegralMessageTypeEnum { QUESTIONNAIRE_ACTIVITY(5, "问卷活动"), MEMBER_MANAGEMENT(6, "会员管理"), MESSAGE_TEMPLATE(7, "消息模板"), - LEAVE_MESSAGE(8, "留言"); + LEAVE_MESSAGE(8, "留言"), + COMPLETE_USER_INFORMATION(9, "完善用户信息"); private final Integer code; private final String info; diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxUserMemberServiceImpl.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxUserMemberServiceImpl.java index 073024c..7a18b14 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxUserMemberServiceImpl.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxUserMemberServiceImpl.java @@ -206,6 +206,24 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService { wxUserIntegralLog.setRemarkContent("首次完善用户信息"); wxUserIntegralLogMapper.insertWxUserIntegralLog(wxUserIntegralLog); + // 2.4、用户注册成功发送消息 + WxScriptMessage wxScriptMessage = wxScriptMessageMapper.selectOneByMessageType(MessageTypeEnum.COMPLETE_USER_INFORMATION.getCode()); + if (wxScriptMessage != null) { + WxUserScriptLog wxUserScriptLog = new WxUserScriptLog(); + BeanUtils.copyProperties(wxScriptMessage, wxUserScriptLog); + wxUserScriptLog.setId(null); + wxUserScriptLog.setWxUserId(SecurityUtils.getLoginUser().getWxUserMember().getId()); + wxUserScriptLog.setMessageType(WxUserIntegralMessageTypeEnum.COMPLETE_USER_INFORMATION.getCode()); + wxUserScriptLog.setIsCustom(0); + wxUserScriptLog.setTitile(wxScriptMessage.getMessageTitle()); + wxUserScriptLog.setContent(wxScriptMessage.getMessageContent()); + wxUserScriptLog.setCreateTime(DateUtils.getNowDate()); + wxUserScriptLog.setCreateBy(null); + wxUserScriptLog.setUpdateTime(null); + wxUserScriptLog.setUpdateBy(null); + wxUserScriptLogMapper.insertWxUserScriptLog(wxUserScriptLog); + } + // TODO: 首次完善,增加加分 (对接数云未完成) } BeanUtils.copyProperties(userMemberUpdateVo, wxUserMember); diff --git a/flossom-ui/src/views/system/member/index.vue b/flossom-ui/src/views/system/member/index.vue index 42745c8..a57c0b6 100644 --- a/flossom-ui/src/views/system/member/index.vue +++ b/flossom-ui/src/views/system/member/index.vue @@ -606,6 +606,8 @@ 问卷活动 会员管理 消息模板 + 用户留言 + 完善用户信息 diff --git a/flossom-ui/src/views/system/scriptMessage/index.vue b/flossom-ui/src/views/system/scriptMessage/index.vue index 38326a1..9b22506 100644 --- a/flossom-ui/src/views/system/scriptMessage/index.vue +++ b/flossom-ui/src/views/system/scriptMessage/index.vue @@ -133,6 +133,7 @@ 用户注册 提交留言 仪器绑定 + 完善用户信息 @@ -207,6 +208,7 @@ +