mirror of
https://gitee.com/y_project/RuoYi-Cloud.git
synced 2026-01-26 03:44:57 +08:00
微信小程序头像,手机号同步到PC的用户表
This commit is contained in:
@@ -107,7 +107,7 @@ public interface SysUserMapper
|
|||||||
* @param userName 用户名称
|
* @param userName 用户名称
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
public int checkUserNameUnique(String userName);
|
public int checkUserNameUnique(@Param("userName") String userName);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 校验手机号码是否唯一
|
* 校验手机号码是否唯一
|
||||||
@@ -115,7 +115,7 @@ public interface SysUserMapper
|
|||||||
* @param phonenumber 手机号码
|
* @param phonenumber 手机号码
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
public SysUser checkPhoneUnique(String phonenumber);
|
public SysUser checkPhoneUnique(@Param("phonenumber") String phonenumber);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 校验email是否唯一
|
* 校验email是否唯一
|
||||||
@@ -123,5 +123,7 @@ public interface SysUserMapper
|
|||||||
* @param email 用户邮箱
|
* @param email 用户邮箱
|
||||||
* @return 结果
|
* @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);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -207,4 +207,6 @@ public interface ISysUserService
|
|||||||
public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);
|
public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);
|
||||||
|
|
||||||
SysUser wxScanUserAdd(WxUser wxUser);
|
SysUser wxScanUserAdd(WxUser wxUser);
|
||||||
|
|
||||||
|
int updateUserTelephone(String username, String telephone, String avatar);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -559,6 +559,8 @@ public class SysUserServiceImpl implements ISysUserService
|
|||||||
sysUser.setLoginDate(date);
|
sysUser.setLoginDate(date);
|
||||||
sysUser.setCreateBy("system");
|
sysUser.setCreateBy("system");
|
||||||
sysUser.setCreateTime(date);
|
sysUser.setCreateTime(date);
|
||||||
|
sysUser.setPhonenumber(wxUser.getTelephone());
|
||||||
|
sysUser.setAvatar(wxUser.getAvatar());
|
||||||
sysUser.setRemark("微信扫码登录用户");
|
sysUser.setRemark("微信扫码登录用户");
|
||||||
//设置刚刚
|
//设置刚刚
|
||||||
Long[] postIds = {4L};
|
Long[] postIds = {4L};
|
||||||
@@ -570,4 +572,9 @@ public class SysUserServiceImpl implements ISysUserService
|
|||||||
return sysUser;
|
return sysUser;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int updateUserTelephone(String username, String telephone, String avatar) {
|
||||||
|
return userMapper.updateUserTelephone(username, telephone,avatar);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ import com.ruoyi.system.domain.vo.WxApplesRes;
|
|||||||
import com.ruoyi.system.domain.vo.WxMssVo;
|
import com.ruoyi.system.domain.vo.WxMssVo;
|
||||||
import com.ruoyi.system.domain.vo.WxPhoneNumberVo;
|
import com.ruoyi.system.domain.vo.WxPhoneNumberVo;
|
||||||
import com.ruoyi.system.service.ICompetitionMembersService;
|
import com.ruoyi.system.service.ICompetitionMembersService;
|
||||||
|
import com.ruoyi.system.service.ISysUserService;
|
||||||
import com.ruoyi.system.service.IWxUserService;
|
import com.ruoyi.system.service.IWxUserService;
|
||||||
import com.ruoyi.system.service.WxAppletsService;
|
import com.ruoyi.system.service.WxAppletsService;
|
||||||
import lombok.extern.log4j.Log4j2;
|
import lombok.extern.log4j.Log4j2;
|
||||||
@@ -57,6 +58,8 @@ public class WxAppletsServiceImpl implements WxAppletsService {
|
|||||||
private String domainName;
|
private String domainName;
|
||||||
@Autowired
|
@Autowired
|
||||||
private ICompetitionMembersService competitionMembersService;
|
private ICompetitionMembersService competitionMembersService;
|
||||||
|
@Autowired
|
||||||
|
private ISysUserService sysUserService;
|
||||||
@Override
|
@Override
|
||||||
public String getAccessToken() {
|
public String getAccessToken() {
|
||||||
String accessToken=null;
|
String accessToken=null;
|
||||||
@@ -141,6 +144,9 @@ public class WxAppletsServiceImpl implements WxAppletsService {
|
|||||||
wxUserService.updateWxUser(userInfo);
|
wxUserService.updateWxUser(userInfo);
|
||||||
//todo 赛会参赛人员通过手机号码绑定userid
|
//todo 赛会参赛人员通过手机号码绑定userid
|
||||||
competitionMembersService.bindCompetitionMembersByTel(user.getUserid(),userInfo.getTelephone());
|
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();
|
return userInfo.getTelephone();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -206,7 +206,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
<update id="resetUserPwd" parameterType="com.ruoyi.system.api.domain.SysUser">
|
<update id="resetUserPwd" parameterType="com.ruoyi.system.api.domain.SysUser">
|
||||||
update sys_user set password = #{password} where user_name = #{userName}
|
update sys_user set password = #{password} where user_name = #{userName}
|
||||||
</update>
|
</update>
|
||||||
|
<update id="updateUserTelephone">
|
||||||
|
update sys_user
|
||||||
|
<set>
|
||||||
|
<if test="avatar != null and avatar != ''">avatar = #{avatar},</if>
|
||||||
|
<if test="telephone != null ">phonenumber = #{telephone},</if>
|
||||||
|
update_time = sysdate()
|
||||||
|
</set>
|
||||||
|
where user_name = #{userName}
|
||||||
|
</update>
|
||||||
|
|
||||||
<delete id="deleteUserById" parameterType="Long">
|
<delete id="deleteUserById" parameterType="Long">
|
||||||
update sys_user set del_flag = '2' where user_id = #{userId}
|
update sys_user set del_flag = '2' where user_id = #{userId}
|
||||||
</delete>
|
</delete>
|
||||||
|
|||||||
@@ -150,7 +150,7 @@ export default {
|
|||||||
const timestamp = Date.now();
|
const timestamp = Date.now();
|
||||||
let checkCode = 'wxScanLogin'+timestamp;
|
let checkCode = 'wxScanLogin'+timestamp;
|
||||||
let params ={
|
let params ={
|
||||||
// envVersion: 'develop',
|
envVersion: 'develop',
|
||||||
checkPath: false,
|
checkPath: false,
|
||||||
scene: checkCode,
|
scene: checkCode,
|
||||||
page: 'pages/wxScanLogin/wxScanLogin'
|
page: 'pages/wxScanLogin/wxScanLogin'
|
||||||
|
|||||||
Reference in New Issue
Block a user