diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java index 7b8c4c6b..23f1e770 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java @@ -107,7 +107,7 @@ public interface SysUserMapper * @param userName 用户名称 * @return 结果 */ - public int checkUserNameUnique(String userName); + public int checkUserNameUnique(@Param("userName") String userName); /** * 校验手机号码是否唯一 @@ -115,7 +115,7 @@ public interface SysUserMapper * @param phonenumber 手机号码 * @return 结果 */ - public SysUser checkPhoneUnique(String phonenumber); + public SysUser checkPhoneUnique(@Param("phonenumber") String phonenumber); /** * 校验email是否唯一 @@ -123,5 +123,7 @@ public interface SysUserMapper * @param email 用户邮箱 * @return 结果 */ - public SysUser checkEmailUnique(String email); + public SysUser checkEmailUnique(@Param("email")String email); + + int updateUserTelephone(@Param("userName") String userName,@Param("telephone") String telephone,@Param("avatar")String avatar); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java index 41eb10f1..a353bd8e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java @@ -207,4 +207,6 @@ public interface ISysUserService public String importUser(List userList, Boolean isUpdateSupport, String operName); SysUser wxScanUserAdd(WxUser wxUser); + + int updateUserTelephone(String username, String telephone, String avatar); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java index fb1700a0..2a32d115 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java @@ -559,6 +559,8 @@ public class SysUserServiceImpl implements ISysUserService sysUser.setLoginDate(date); sysUser.setCreateBy("system"); sysUser.setCreateTime(date); + sysUser.setPhonenumber(wxUser.getTelephone()); + sysUser.setAvatar(wxUser.getAvatar()); sysUser.setRemark("微信扫码登录用户"); //设置刚刚 Long[] postIds = {4L}; @@ -570,4 +572,9 @@ public class SysUserServiceImpl implements ISysUserService return sysUser; } + @Override + public int updateUserTelephone(String username, String telephone, String avatar) { + return userMapper.updateUserTelephone(username, telephone,avatar); + } + } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxAppletsServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxAppletsServiceImpl.java index 424b45df..8a43b83e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxAppletsServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxAppletsServiceImpl.java @@ -16,6 +16,7 @@ import com.ruoyi.system.domain.vo.WxApplesRes; import com.ruoyi.system.domain.vo.WxMssVo; import com.ruoyi.system.domain.vo.WxPhoneNumberVo; import com.ruoyi.system.service.ICompetitionMembersService; +import com.ruoyi.system.service.ISysUserService; import com.ruoyi.system.service.IWxUserService; import com.ruoyi.system.service.WxAppletsService; import lombok.extern.log4j.Log4j2; @@ -57,6 +58,8 @@ public class WxAppletsServiceImpl implements WxAppletsService { private String domainName; @Autowired private ICompetitionMembersService competitionMembersService; + @Autowired + private ISysUserService sysUserService; @Override public String getAccessToken() { String accessToken=null; @@ -141,6 +144,9 @@ public class WxAppletsServiceImpl implements WxAppletsService { wxUserService.updateWxUser(userInfo); //todo 赛会参赛人员通过手机号码绑定userid competitionMembersService.bindCompetitionMembersByTel(user.getUserid(),userInfo.getTelephone()); + //todo PC端的用户表的手机号码也要更新 + WxUser dbWxUser = wxUserService.selectWxUserById(user.getUserid()); + sysUserService.updateUserTelephone(user.getUsername(),userInfo.getTelephone(),dbWxUser.getAvatar()); return userInfo.getTelephone(); } diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index ea73e2b9..73c71fc2 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -206,7 +206,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update sys_user set password = #{password} where user_name = #{userName} - + + update sys_user + + avatar = #{avatar}, + phonenumber = #{telephone}, + update_time = sysdate() + + where user_name = #{userName} + + update sys_user set del_flag = '2' where user_id = #{userId} diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue index 649b7b3d..3d5a063e 100644 --- a/ruoyi-ui/src/views/login.vue +++ b/ruoyi-ui/src/views/login.vue @@ -150,7 +150,7 @@ export default { const timestamp = Date.now(); let checkCode = 'wxScanLogin'+timestamp; let params ={ - // envVersion: 'develop', + envVersion: 'develop', checkPath: false, scene: checkCode, page: 'pages/wxScanLogin/wxScanLogin'