diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/CtLeaveMessageMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/CtLeaveMessageMapper.xml index 24dcf32..baf9cf6 100644 --- a/flossom-common/flossom-common-core/src/main/resources/mapper/CtLeaveMessageMapper.xml +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/CtLeaveMessageMapper.xml @@ -117,5 +117,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and create_time <= #{params.endTime} + order by create_time desc 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 16b6124..969d298 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 @@ -2,12 +2,14 @@ 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.WxUserMember; 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.WxUserMemberMapper; import com.flossom.common.core.mapper.WxUserScriptLogMapper; import com.flossom.common.core.utils.DateUtils; import com.flossom.common.security.utils.SecurityUtils; @@ -30,6 +32,9 @@ public class CtleaveMessageServiceImpl implements ICtleaveMeassageService { @Autowired private WxUserScriptLogMapper wxUserScriptLogMapper; + @Autowired + private WxUserMemberMapper wxUserMemberMapper; + @Transactional @Override public int saveCtleaveMeassage(CtLeaveMessage ctLeaveMessage) { @@ -56,10 +61,14 @@ public class CtleaveMessageServiceImpl implements ICtleaveMeassageService { CtLeaveMessageEnum ctLeaveMessageEnum = CtLeaveMessageEnum.fromString(ctLeaveMessage.getSource()); ctLeaveMessage.setSourceName(ctLeaveMessageEnum.getRemark()); ctLeaveMessage.setCreateTime(new Date()); - ctLeaveMessage.setUserId(SecurityUtils.getLoginUser().getWxUserMember().getId()); - ctLeaveMessage.setUserImg(SecurityUtils.getLoginUser().getWxUserMember().getHeadimg()); - ctLeaveMessage.setUserName(SecurityUtils.getLoginUser().getWxUserMember().getNickname()); - ctLeaveMessage.setUserPhone(SecurityUtils.getLoginUser().getWxUserMember().getMobile()); + WxUserMember wxUserMember = wxUserMemberMapper.selectWxUserMemberById(SecurityUtils.getLoginUser().getWxUserMember().getId()); + if (wxUserMember != null) { + ctLeaveMessage.setUserId(wxUserMember.getId()); + ctLeaveMessage.setUserNumber(wxUserMember.getId().intValue()); + ctLeaveMessage.setUserImg(wxUserMember.getHeadimg()); + ctLeaveMessage.setUserName(wxUserMember.getNickname()); + ctLeaveMessage.setUserPhone(wxUserMember.getMobile()); + } return ctLeaveMessageMapper.insertCtLeaveMessage(ctLeaveMessage); } } 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 403cdb9..672908f 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 @@ -248,7 +248,10 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService { @Override @Transactional(propagation = Propagation.SUPPORTS) public LoginUserVo refreshWxUserInfo() { - String openid = SecurityUtils.getLoginUser().getWxUserMember().getOpenid(); + LoginUser loginUser = SecurityUtils.getLoginUser(); + + // 响应最新数据 + String openid = loginUser.getWxUserMember().getOpenid(); WxUserMember wxUserMember = wxUserMemberMapper.selectWxUserMemberByOpenId(openid); if (wxUserMember == null) { logger.error("刷新用户信息失败"); @@ -258,6 +261,11 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService { BeanUtils.copyProperties(wxUserMember, loginUserVo); loginUserVo.setToken(null); loginUserVo.setIntegralText(null); + + // 刷新缓存信息 + String userKey = CacheConstants.LOGIN_TOKEN_KEY + loginUser.getToken(); + loginUser.setWxUserMember(wxUserMember); + redisService.setCacheObject(userKey, loginUser, CacheConstants.EXPIRATION, TimeUnit.MINUTES); return loginUserVo; } diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/CtLeaveMessageController.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/CtLeaveMessageController.java index b645d19..7ad55a1 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/CtLeaveMessageController.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/CtLeaveMessageController.java @@ -50,14 +50,14 @@ public class CtLeaveMessageController extends BaseController startPage(); // List list = ctLeaveMessageService.selectCtLeaveMessageList(ctLeaveMessage); List list = ctLeaveMessageService.selectCtLeaveMessageByCondition(ctLeaveMessage); - for (CtLeaveMessage leaveMessage: list) { - System.out.println("获取到用户id="+leaveMessage.getUserId()); - if (Objects.nonNull(leaveMessage.getUserId())) { - WxUserMember userMember = wxUserMemberService.selectWxUserMemberByIdInit(leaveMessage.getUserId()); - System.out.println("获取到用户="+userMember); - leaveMessage.setWxUserMember(userMember); - } - } +// for (CtLeaveMessage leaveMessage: list) { +// System.out.println("获取到用户id="+leaveMessage.getUserId()); +// if (Objects.nonNull(leaveMessage.getUserId())) { +// WxUserMember userMember = wxUserMemberService.selectWxUserMemberByIdInit(leaveMessage.getUserId()); +// System.out.println("获取到用户="+userMember); +// leaveMessage.setWxUserMember(userMember); +// } +// } return getDataTable(list); } diff --git a/flossom-ui/src/views/system/leaveMessage/index.vue b/flossom-ui/src/views/system/leaveMessage/index.vue index f7c9a66..af275db 100644 --- a/flossom-ui/src/views/system/leaveMessage/index.vue +++ b/flossom-ui/src/views/system/leaveMessage/index.vue @@ -84,17 +84,19 @@ - + - - - + + +