From 6857b9112bb1e86437086bd248ce4fa4df1560a4 Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Thu, 11 Jan 2024 13:50:40 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../miniProgram/service/impl/WxUserMemberServiceImpl.java | 1 + 1 file changed, 1 insertion(+) 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 061943d..90b979f 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 @@ -137,6 +137,7 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService { } WxUserMember update = new WxUserMember(); + update.setId(wxUserMember.getId()); BeanUtils.copyProperties(userMemberUpdateVo, update); update.setUpdateTime(DateUtils.getNowDate()); wxUserMemberMapper.updateWxUserMember(update); From cdcf32774b7b512dd4a6a5dee1b63de8f093d188 Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Thu, 11 Jan 2024 14:05:33 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../flossom/miniProgram/controller/UserMemberController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/UserMemberController.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/UserMemberController.java index ad54728..da29254 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/UserMemberController.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/UserMemberController.java @@ -67,7 +67,7 @@ public class UserMemberController extends BaseController { * @return */ @PostMapping("/updateUser") - public R updateUser(@RequestParam(value = "file", required = false) MultipartFile file, @Validated UserMemberUpdateVo userMemberUpdateVo) { + public R updateUser(@RequestParam(value = "headimg", required = false) MultipartFile file, @Validated UserMemberUpdateVo userMemberUpdateVo) { if (file != null) { R result = remoteFileService.upload(file); if (result.getCode() != Constants.SUCCESS) { From 966a92279edf0b95e9d0e08832742e4f390191ef Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Thu, 11 Jan 2024 14:47:55 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/flossom/common/core/mapper/WxUserIntegralLogMapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxUserIntegralLogMapper.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxUserIntegralLogMapper.java index c3bd03b..0f20ded 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxUserIntegralLogMapper.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxUserIntegralLogMapper.java @@ -63,5 +63,5 @@ public interface WxUserIntegralLogMapper List obtainUserIntegral(@Param("userId") Long userId); - List deleteWxUserIntegralLogByUserId(@Param("userId") Long userId); + int deleteWxUserIntegralLogByUserId(@Param("userId") Long userId); } From 2e8d1b8663cdd5d1c08501dc31cf4804b987785f Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Thu, 11 Jan 2024 15:41:54 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=B3=A8=E5=86=8C?= =?UTF-8?q?=E6=88=90=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 --- .../core/mapper/WxScriptMessageMapper.java | 2 ++ .../mapper/WxScriptMessageMapper.xml | 9 ++++++++ .../resources/mapper/WxUserMemberMapper.xml | 3 +++ .../service/impl/WxUserMemberServiceImpl.java | 23 +++++++++++++++++++ 4 files changed, 37 insertions(+) diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxScriptMessageMapper.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxScriptMessageMapper.java index 29f7077..534e968 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxScriptMessageMapper.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxScriptMessageMapper.java @@ -59,4 +59,6 @@ public interface WxScriptMessageMapper * @return 结果 */ public int deleteWxScriptMessageByIds(Long[] ids); + + public WxScriptMessage selectOneByMessageType(Integer messageType); } diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/WxScriptMessageMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/WxScriptMessageMapper.xml index a7d424e..469dde0 100644 --- a/flossom-common/flossom-common-core/src/main/resources/mapper/WxScriptMessageMapper.xml +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxScriptMessageMapper.xml @@ -132,4 +132,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} + + diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserMemberMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserMemberMapper.xml index 427deb7..154ab9c 100644 --- a/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserMemberMapper.xml +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserMemberMapper.xml @@ -199,6 +199,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + SELECT LAST_INSERT_ID() + insert into wx_user_member nickname, 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 90b979f..b7bdb86 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 @@ -5,9 +5,15 @@ import com.flossom.common.core.constant.CacheConstants; import com.flossom.common.core.constant.UserConstants; import com.flossom.common.core.domain.R; import com.flossom.common.core.domain.RegisterBody; +import com.flossom.common.core.domain.entity.WxScriptMessage; import com.flossom.common.core.domain.entity.WxUserMember; +import com.flossom.common.core.domain.entity.WxUserScriptLog; +import com.flossom.common.core.enums.MessageTypeEnum; +import com.flossom.common.core.enums.WxUserIntegralMessageTypeEnum; import com.flossom.common.core.exception.ServiceException; +import com.flossom.common.core.mapper.WxScriptMessageMapper; import com.flossom.common.core.mapper.WxUserMemberMapper; +import com.flossom.common.core.mapper.WxUserScriptLogMapper; import com.flossom.common.core.utils.DateUtils; import com.flossom.common.redis.service.RedisService; import com.flossom.common.security.utils.SecurityUtils; @@ -42,6 +48,12 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService { @Autowired private RedisService redisService; + @Autowired + private WxScriptMessageMapper wxScriptMessageMapper; + + @Autowired + private WxUserScriptLogMapper wxUserScriptLogMapper; + @Override public LoginUserVo login(String code) throws Exception { // 1、使用临时凭证 code 获取 appi + appsecret + unionid @@ -76,6 +88,17 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService { logger.error("测试后台账号失败：{}", registerResult.getMsg()); throw new ServiceException(registerResult.getMsg()); } + // 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); } // 3、登录请求，获取 token From 13980002d652bfd249433266a4731152d6433825 Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Thu, 11 Jan 2024 15:50:23 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=95=99=E8=A8=80?= =?UTF-8?q?=E6=88=90=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 | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) 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 3410b92..471a480 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 @@ -1,11 +1,20 @@ package com.flossom.miniProgram.service.impl; import com.flossom.common.core.domain.entity.CtLeaveMessage; +import com.flossom.common.core.domain.entity.WxScriptMessage; +import com.flossom.common.core.domain.entity.WxUserScriptLog; import com.flossom.common.core.enums.CtLeaveMessageEnum; +import com.flossom.common.core.enums.MessageTypeEnum; +import com.flossom.common.core.enums.WxUserIntegralMessageTypeEnum; import com.flossom.common.core.mapper.CtLeaveMessageMapper; +import com.flossom.common.core.mapper.WxScriptMessageMapper; +import com.flossom.common.core.mapper.WxUserScriptLogMapper; +import com.flossom.common.security.utils.SecurityUtils; import com.flossom.miniProgram.service.ICtleaveMeassageService; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.Date; @@ -14,8 +23,28 @@ public class CtleaveMessageServiceImpl implements ICtleaveMeassageService { @Autowired private CtLeaveMessageMapper ctLeaveMessageMapper; + @Autowired + private WxScriptMessageMapper wxScriptMessageMapper; + + @Autowired + private WxUserScriptLogMapper wxUserScriptLogMapper; + + @Transactional @Override 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); + + // 保存消息 CtLeaveMessageEnum ctLeaveMessageEnum = CtLeaveMessageEnum.fromString(ctLeaveMessage.getSource()); ctLeaveMessage.setSourceName(ctLeaveMessageEnum.getRemark()); ctLeaveMessage.setCreateTime(new Date());