2023-08-07

yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserService.java

@@ -1178,11 +1178,13 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
         if (!jsonObject.containsKey("openid")){
             return rb.setMsg("未获得openid，请联系管理员");
         }
-        //String unionid = jsonObject.get("unionid").toString();
+//        String unionid = jsonObject.get("unionid").toString();
         String openid = jsonObject.get("openid").toString();
         // 判断用户登陆授权表是否存在该用户unionid和openid，如果不存在就增加一条返回
         SysUser sysUser=baseMapper.selectOne(new QueryWrapper<SysUser>().eq("appletOpenid",openid));
-
+//        Map<String,String> map=new HashMap<>();
+//        map.put("openid",openid);
+//        map.put("unionid",unionid);
         if(sysUser==null){
             return rb.setMsg("此微信没有绑定用户").setCode("100").setData(openid);
         }else{
@@ -1264,17 +1266,16 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
         String mobile = sysUserWxBindMobileDto.getMobile();
         // 校验手机验证码
         String code = sysUserWxBindMobileDto.getCode();
-        Map<String, Object> vali = mobileValidateWxRegister(mobile,code);
-//        if (!rb.getSuccess()){
-//            return rb;
-//        }
-        if(!vali.get("code").equals("200")){
-            return rb.setMsg(vali.get("details").toString());
-        }
+        SysUser sysUser = baseMapper.selectOne(new QueryWrapper<SysUser>().eq("mobile",mobile));
         String sysUserSid = "";
         // 通过手机号查询及添加用户信息
-        SysUser sysUser = baseMapper.selectOne(new QueryWrapper<SysUser>().eq("mobile",mobile));
+//        SysUser sysUser = baseMapper.selectOne(new QueryWrapper<SysUser>().eq("mobile",mobile));
         if (sysUser != null) {
+            //手机号存在再验证验证码
+            Map<String, Object> vali = mobileValidateWxRegister(mobile,code);
+            if(!vali.get("code").equals("200")){
+                return rb.setMsg(vali.get("details").toString());
+            }
             sysUserSid = sysUser.getSid();
             sysUser.setAppletOpenid(sysUserWxBindMobileDto.getOpenid());
             sysUser.setUnionid(sysUserWxBindMobileDto.getUnionid());