/appLogin返回参数添加角色和idcard

ruoyi-bussiness/src/main/resources/mapper/app/AppUserMapper.xml

@@ -64,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectByOpenid" resultType="com.ruoyi.common.core.domain.entity.AppUser">
-        SELECT * FROM app_user WHERE DEL_FLAG = '0' and openid=#{openid} LIMIT 1
+        <include refid="selectAppUserVo"/> WHERE DEL_FLAG = '0' and openid=#{openid} LIMIT 1
     </select>
 
     <insert id="insertSysUserRole" parameterType="java.util.Map">

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java

@@ -259,7 +259,8 @@ public class SysLoginService
             String token = loginUserIdApp(existingUser);
             ajax.put(Constants.TOKEN, token);
             ajax.put("isNewUser", false);
-            ajax.put("code", existingUser.getIdCard());
+            ajax.put("idCard",existingUser.getIdCard());
+            ajax.put("isCompanyUser",existingUser.getIsCompanyUser());
             return ajax;
         }else {
             JSONObject phoneInfo = wechatUtil.decryptPhoneNumber(dto.getEncryptedData(), sessionKey, dto.getIv());
@@ -270,22 +271,29 @@ public class SysLoginService
 
             // 3. 检查手机号是否已被绑定
             AppUser existUser = appUserService.getPhone(phone);
+            String token="";
+            boolean isNewUser=false;
             if (existUser != null) {
-                return AjaxResult.error("该手机号已注册");
+                existUser.setOpenid(openid);
+                appUserService.updateAppUser(existUser);
+                // 5. 生成系统令牌
+                token = loginUserIdApp(existUser);
+                ajax.put("idCard",existUser.getIdCard());
+                ajax.put("isCompanyUser",existUser.getIsCompanyUser());
+            }else{
+                // 4. 创建用户并存储所有信息
+                AppUser appUser = new AppUser();
+                appUser.setOpenid(openid);
+                appUser.setUnionid(unionid);
+                appUser.setPhone(phone);
+                appUser.setIsCompanyUser(dto.getUserType());//保存角色
+                appUserService.insertAppUser(appUser);
+                // 5. 生成系统令牌
+                token = loginUserIdApp(appUser);
+                isNewUser=true;
             }
-
-            // 4. 创建用户并存储所有信息
-            AppUser appUser = new AppUser();
-            appUser.setOpenid(openid);
-            appUser.setUnionid(unionid);
-            appUser.setPhone(phone);
-            appUser.setIsCompanyUser(dto.getUserType());//保存角色
-            appUserService.insertAppUser(appUser);
-
-            // 5. 生成系统令牌
-            String token = loginUserIdApp(appUser);
+            ajax.put("isNewUser", isNewUser);
             ajax.put(Constants.TOKEN, token);
-            ajax.put("isNewUser", true);
             return ajax;
         }
     }