From 0fa6ef6e106f537d1d4b521080d65c59c5bd4f8d Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Thu, 11 Jan 2024 16:51:16 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=B3=A8=E5=86=8C?= =?UTF-8?q?=E3=80=81=E7=94=A8=E6=88=B7=E7=95=99=E8=A8=80=20=E6=88=90?= =?UTF-8?q?=E5=8A=9F=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CtleaveMessageServiceImpl.java | 21 +++++++++------- .../service/impl/WxUserMemberServiceImpl.java | 24 ++++++++++++------- 2 files changed, 27 insertions(+), 18 deletions(-) diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/CtleaveMessageServiceImpl.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/CtleaveMessageServiceImpl.java index 471a480..e4c45b4 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/CtleaveMessageServiceImpl.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/CtleaveMessageServiceImpl.java @@ -34,15 +34,18 @@ public class CtleaveMessageServiceImpl implements ICtleaveMeassageService { public int saveCtleaveMeassage(CtLeaveMessage ctLeaveMessage) { // 留言成功发送消息 WxScriptMessage wxScriptMessage = wxScriptMessageMapper.selectOneByMessageType(MessageTypeEnum.SUBMIT_MESSAGE.getCode()); - WxUserScriptLog wxUserScriptLog = new WxUserScriptLog(); - BeanUtils.copyProperties(wxScriptMessage, wxUserScriptLog); - wxUserScriptLog.setId(null); - wxUserScriptLog.setWxUserId(SecurityUtils.getLoginUser().getWxUserMember().getId()); - wxUserScriptLog.setMessageType(WxUserIntegralMessageTypeEnum.USER_REGISTRATION.getCode()); - wxUserScriptLog.setIsCustom(0); - wxUserScriptLog.setTitile(wxScriptMessage.getMessageTitle()); - wxUserScriptLog.setContent(wxScriptMessage.getMessageContent()); - wxUserScriptLogMapper.insertWxUserScriptLog(wxUserScriptLog); + if (wxScriptMessage != null) { + WxUserScriptLog wxUserScriptLog = new WxUserScriptLog(); + BeanUtils.copyProperties(wxScriptMessage, wxUserScriptLog); + wxUserScriptLog.setId(null); + wxUserScriptLog.setWxUserId(SecurityUtils.getLoginUser().getWxUserMember().getId()); + wxUserScriptLog.setMessageType(WxUserIntegralMessageTypeEnum.USER_REGISTRATION.getCode()); + wxUserScriptLog.setIsCustom(0); + wxUserScriptLog.setTitile(wxScriptMessage.getMessageTitle()); + wxUserScriptLog.setContent(wxScriptMessage.getMessageContent()); + wxUserScriptLogMapper.insertWxUserScriptLog(wxUserScriptLog); + } + // 保存消息 CtLeaveMessageEnum ctLeaveMessageEnum = CtLeaveMessageEnum.fromString(ctLeaveMessage.getSource()); 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 b7bdb86..90057f1 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 @@ -55,6 +55,7 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService { private WxUserScriptLogMapper wxUserScriptLogMapper; @Override + @Transactional public LoginUserVo login(String code) throws Exception { // 1、使用临时凭证 code 获取 appi + appsecret + unionid String result = MiniProgramUtils.getSessionKeyAndOpenId(code); @@ -80,6 +81,9 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService { // 2.2、微信用户表注册 wxUserMemberMapper.insertWxUserMember(wxUserMember); // 2.3、系统表注册 + /** + * TODO: 分布式事务 + */ RegisterBody registerBody = new RegisterBody(); registerBody.setUsername(wxUserMember.getOpenid()); registerBody.setPassword(UserConstants.WX_SYSTEM_USER_PASSWORD); @@ -90,15 +94,17 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService { } // 2.4、用户注册成功发送消息 WxScriptMessage wxScriptMessage = wxScriptMessageMapper.selectOneByMessageType(MessageTypeEnum.USER_REGISTRATION.getCode()); - WxUserScriptLog wxUserScriptLog = new WxUserScriptLog(); - BeanUtils.copyProperties(wxScriptMessage, wxUserScriptLog); - wxUserScriptLog.setId(null); - wxUserScriptLog.setWxUserId(wxUserMember.getId()); - wxUserScriptLog.setMessageType(WxUserIntegralMessageTypeEnum.USER_REGISTRATION.getCode()); - wxUserScriptLog.setIsCustom(0); - wxUserScriptLog.setTitile(wxScriptMessage.getMessageTitle()); - wxUserScriptLog.setContent(wxScriptMessage.getMessageContent()); - wxUserScriptLogMapper.insertWxUserScriptLog(wxUserScriptLog); + if (wxScriptMessage != null) { + WxUserScriptLog wxUserScriptLog = new WxUserScriptLog(); + BeanUtils.copyProperties(wxScriptMessage, wxUserScriptLog); + wxUserScriptLog.setId(null); + wxUserScriptLog.setWxUserId(wxUserMember.getId()); + wxUserScriptLog.setMessageType(WxUserIntegralMessageTypeEnum.USER_REGISTRATION.getCode()); + wxUserScriptLog.setIsCustom(0); + wxUserScriptLog.setTitile(wxScriptMessage.getMessageTitle()); + wxUserScriptLog.setContent(wxScriptMessage.getMessageContent()); + wxUserScriptLogMapper.insertWxUserScriptLog(wxUserScriptLog); + } } // 3、登录请求，获取 token From c58bd3e6813281b9debd6de159c333115a8d7ebb Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Thu, 11 Jan 2024 16:57:27 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=A4=87=E6=B3=A8=E9=99=90=E5=88=B6100=E4=B8=AA=E5=AD=97?= =?UTF-8?q?=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flossom-ui/src/views/system/member/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/flossom-ui/src/views/system/member/index.vue b/flossom-ui/src/views/system/member/index.vue index 990dd6e..cf9e84a 100644 --- a/flossom-ui/src/views/system/member/index.vue +++ b/flossom-ui/src/views/system/member/index.vue @@ -313,7 +313,8 @@ - +
From 4ec68e5423641c3371356593a1e842cb3b8ddd0e Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Thu, 11 Jan 2024 16:59:50 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E5=85=A8=E9=87=8F=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=A0=87=E7=AD=BE=E6=A0=87=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flossom-ui/src/views/system/member/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flossom-ui/src/views/system/member/index.vue b/flossom-ui/src/views/system/member/index.vue index cf9e84a..09fa0d4 100644 --- a/flossom-ui/src/views/system/member/index.vue +++ b/flossom-ui/src/views/system/member/index.vue @@ -1393,7 +1393,7 @@ export default { this.title = "添加小程序标签"; } if (this.batchOperateValue == 4) { - this.title = "添加小程序标签"; + this.title = "删除小程序标签"; } this.batchMiniProgramVisible = true; } From ca045daf212ae2014421d7524ac41829c2fd7e25 Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Thu, 11 Jan 2024 17:06:32 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E9=87=8D=E7=BD=AE=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E6=A0=87=E9=A2=98=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flossom-ui/src/views/system/member/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flossom-ui/src/views/system/member/index.vue b/flossom-ui/src/views/system/member/index.vue index 09fa0d4..13dd6cc 100644 --- a/flossom-ui/src/views/system/member/index.vue +++ b/flossom-ui/src/views/system/member/index.vue @@ -1138,9 +1138,9 @@ export default { }, // 关闭添加小程序标签窗口 cancelMiniProgramDialog(isClose) { - this.title = null; this.miniProgramForm.tagIdArray = []; if (isClose) { + this.title = null; this.batchMiniProgramVisible = false; } }, From 3a94cbdd8befdc4101dd67ab3983a15351498053 Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Thu, 11 Jan 2024 17:12:32 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E6=89=B9=E9=87=8F/=E5=85=A8=E9=87=8F?= =?UTF-8?q?=E5=8F=91=E9=80=81=E8=AF=9D=E6=9C=AF=E5=BC=B9=E7=AA=97=E3=80=90?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E3=80=91=E6=8C=89=E9=92=AE=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E3=80=90=E9=87=8D=E7=BD=AE=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flossom-ui/src/views/system/member/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flossom-ui/src/views/system/member/index.vue b/flossom-ui/src/views/system/member/index.vue index 13dd6cc..659f1e9 100644 --- a/flossom-ui/src/views/system/member/index.vue +++ b/flossom-ui/src/views/system/member/index.vue @@ -586,7 +586,7 @@
确 定 - 取 消 + 重 置
From 61e45ba13d2a5df9af672f3d3808e17d9af9eb2c Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Thu, 11 Jan 2024 17:21:47 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E4=BC=9A=E5=91=98=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxUserMemberServiceImpl.java | 27 +++++++++++++------ 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserMemberServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserMemberServiceImpl.java index 50f6868..9e14f5c 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserMemberServiceImpl.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserMemberServiceImpl.java @@ -148,20 +148,31 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService { WxUserMember wxUserMember = new WxUserMember(); BeanUtils.copyProperties(wxUserMemberReq, wxUserMember); // 补充 省市区信息 - SysRegion province = sysRegionMapper.selectSysRegionById(wxUserMemberReq.getProvinceId()); - wxUserMember.setProvince(province.getName()); - SysRegion city = sysRegionMapper.selectSysRegionById(wxUserMemberReq.getCityId()); - wxUserMember.setCity(city.getName()); - SysRegion area = sysRegionMapper.selectSysRegionById(wxUserMemberReq.getAreaId()); - wxUserMember.setArea(area.getName()); + if (wxUserMemberReq.getProvinceId() != null) { + SysRegion province = sysRegionMapper.selectSysRegionById(wxUserMemberReq.getProvinceId()); + wxUserMember.setProvince(province.getName()); + } + if (wxUserMemberReq.getCityId() != null) { + SysRegion city = sysRegionMapper.selectSysRegionById(wxUserMemberReq.getCityId()); + wxUserMember.setCity(city.getName()); + } + if (wxUserMemberReq.getAreaId() != null) { + SysRegion area = sysRegionMapper.selectSysRegionById(wxUserMemberReq.getAreaId()); + wxUserMember.setArea(area.getName()); + } + // 删除用户与标签的关联关系 wxUserTagMapper.deleteWxUserTagByUserId(wxUserMemberReq.getId()); // 添加用户与小程序标签关联 List userIdList = new ArrayList<>(); userIdList.add(wxUserMemberReq.getId().intValue()); - batchAddMiniProgramTag(wxUserMemberReq.getMiniProgramTags(), userIdList); + if (wxUserMemberReq.getMiniProgramTags() != null && wxUserMemberReq.getMiniProgramTags().size() > 0) { + batchAddMiniProgramTag(wxUserMemberReq.getMiniProgramTags(), userIdList); + } // 添加用户与企微标签关联 - batchAddWecomTag(wxUserMemberReq.getWecomTags(), userIdList); + if (wxUserMemberReq.getWecomTags() != null && wxUserMemberReq.getWecomTags().size() > 0) { + batchAddWecomTag(wxUserMemberReq.getWecomTags(), userIdList); + } return wxUserMemberMapper.updateWxUserMember(wxUserMember); } From 2faa8b59036c1db8f6d5694f7a06e00b48eb4568 Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Thu, 11 Jan 2024 17:53:36 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E4=BC=9A=E5=91=98=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=EF=BC=9A=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E9=BB=98=E8=AE=A4=E5=BD=93=E5=A4=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flossom-ui/src/views/system/member/index.vue | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/flossom-ui/src/views/system/member/index.vue b/flossom-ui/src/views/system/member/index.vue index 659f1e9..d5084cf 100644 --- a/flossom-ui/src/views/system/member/index.vue +++ b/flossom-ui/src/views/system/member/index.vue @@ -1006,6 +1006,11 @@ export default { }; }, created() { + // 查询条件创建时间默认为当天 + let siteStartTime = this.dateUtil(new Date(new Date().toLocaleDateString())); + let siteEndTime = this.dateUtil(new Date(new Date(new Date().toLocaleDateString()).getTime() + 24 * 60 * 60 * 1000 - 1)); + this.dateRange = [siteStartTime, siteEndTime]; + // 获取用户统计信息 this.getUserCount(); // 获取表单数据 @@ -1028,6 +1033,16 @@ export default { this.loading = false; }); }, + dateUtil(date){ + // 获取年份、月份和日期 + const year = date.getFullYear().toString(); // 四位数表示的年份 + const months = (date.getMonth() + 1).toString().padStart(2, '0'); // 补零后的两位数表示的月份 + const day = date.getDate().toString().padStart(2, '0'); // 补零后的两位数表示的日期 + const hours = date.getHours().toString().padStart(2, '0'); // 补全两位数的小时 + const minutes = date.getMinutes().toString().padStart(2, '0'); // 补全两位数的分钟 + const seconds = date.getSeconds().toString().padStart(2, '0'); + return `${year}-${months}-${day} ${hours}:${minutes}:${seconds}`; + }, getUserCount() { selectUserCount().then(Response => { this.count.userNum = Response.data[0]; From b0ea362936b7c2322c8550b9d3c26305b312fa4e Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Thu, 11 Jan 2024 17:58:57 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E4=BC=9A=E5=91=98=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E5=8F=91=E9=80=81=E8=AF=9D=E6=9C=AF=20=E8=A7=86=E9=A2=91?= =?UTF-8?q?=E5=8F=B7id=E4=BB=A5sph=E5=BC=80=E5=A4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/WxUserScriptLogController.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxUserScriptLogController.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxUserScriptLogController.java index 9f02ded..ce2bc06 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxUserScriptLogController.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxUserScriptLogController.java @@ -157,6 +157,9 @@ public class WxUserScriptLogController extends BaseController { if (StringUtils.isBlank(wxUserScriptReq.getVideoNo())) { return R.fail("请输入视频号id"); } + if(!wxUserScriptReq.getVideoNo().startsWith("sph")){ + return R.fail("请输入以“sph”开头的视频号id，可在视频号助手获取"); + } if (StringUtils.isBlank(wxUserScriptReq.getFeedId())) { return R.fail("请输入视频号feedid"); } @@ -166,6 +169,9 @@ public class WxUserScriptLogController extends BaseController { if (StringUtils.isBlank(wxUserScriptReq.getVideoNo())) { return R.fail("请输入视频号id"); } + if(!wxUserScriptReq.getVideoNo().startsWith("sph")){ + return R.fail("请输入以“sph”开头的视频号id，可在视频号助手获取"); + } } } wxUserScriptLogService.sendScript(wxUserScriptReq); @@ -225,6 +231,9 @@ public class WxUserScriptLogController extends BaseController { if (StringUtils.isBlank(wxUserScriptReq.getVideoNo())) { return R.fail("请输入视频号id"); } + if(!wxUserScriptReq.getVideoNo().startsWith("sph")){ + return R.fail("请输入以“sph”开头的视频号id，可在视频号助手获取"); + } if (StringUtils.isBlank(wxUserScriptReq.getFeedId())) { return R.fail("请输入视频号feedid"); } @@ -234,6 +243,9 @@ public class WxUserScriptLogController extends BaseController { if (StringUtils.isBlank(wxUserScriptReq.getVideoNo())) { return R.fail("请输入视频号id"); } + if(!wxUserScriptReq.getVideoNo().startsWith("sph")){ + return R.fail("请输入以“sph”开头的视频号id，可在视频号助手获取"); + } } }