fix: 用户手机号查询修改；

jd-logistics-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java

@@ -210,10 +210,10 @@ public class SysLoginService
         }
 
         SysUser sysUser = new SysUser();
-        String username = phoneNumber.getData();
+        String phone = phoneNumber.getData();
         String openId = openIdData.getData();
         sysUser.setOpenId(openId);
-        sysUser.setPhonenumber(username);
+        sysUser.setPhonenumber(phone);
         // 查询用户信息
         R<LoginUser> userResult = remoteUserService.getUserByOpenId(sysUser, SecurityConstants.INNER);
 
@@ -226,15 +226,15 @@ public class SysLoginService
         SysUser user = userResult.getData().getSysUser();
         if (UserStatus.DELETED.getCode().equals(user.getDelFlag()))
         {
-            recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "对不起，您的账号已被删除");
-            throw new ServiceException("对不起，您的账号：" + username + " 已被删除");
+            recordLogService.recordLogininfor(phone, Constants.LOGIN_FAIL, "对不起，您的账号已被删除");
+            throw new ServiceException("对不起，您的账号：" + phone + " 已被删除");
         }
         if (UserStatus.DISABLE.getCode().equals(user.getStatus()))
         {
-            recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户已停用，请联系管理员");
-            throw new ServiceException("对不起，您的账号：" + username + " 已停用");
+            recordLogService.recordLogininfor(phone, Constants.LOGIN_FAIL, "用户已停用，请联系管理员");
+            throw new ServiceException("对不起，您的账号：" + phone + " 已停用");
         }
-        recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功");
+        recordLogService.recordLogininfor(phone, Constants.LOGIN_SUCCESS, "登录成功");
         //recordLoginInfo(user.getUserId());
         recordLoginInfoAndPolicy(user);
         return userInfo;

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/front/controller/WxMiniController.java

@@ -62,7 +62,7 @@ public class WxMiniController {
         SysUser currentUser = sysUserService.selectUserByOpenId(sysUser);
         if (StringUtils.isNull(currentUser))
         {
-            currentUser = sysUserService.selectUserByUserName(sysUser.getUserName());
+            currentUser = sysUserService.selectUserByPhoneNumber(sysUser.getPhonenumber());
             if (StringUtils.isNull(currentUser))
             {
                 return R.fail("用户不存在");

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java

@@ -128,8 +128,16 @@ public interface SysUserMapper
     /**
      * 通过微信openId查询用户
      *
-     * @param userName 用户名
+     * @param phoneNumber 用户名
+     * @return 用户对象信息
+     */
+    public SysUser selectUserByOpenId(@Param("phoneNumber") String phoneNumber, @Param("openId") String openId);
+
+    /**
+     * 通过手机号查询用户
+     *
+     * @param phoneNumber 用户名
      * @return 用户对象信息
      */
-    public SysUser selectUserByOpenId(@Param("userName") String userName, @Param("openId") String openId);
+    public SysUser selectUserByPhoneNumber(@Param("phoneNumber") String phoneNumber);
 }

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/system/service/ISysUserService.java

@@ -222,4 +222,12 @@ public interface ISysUserService
      * @return 用户对象信息
      */
     public SysUser selectUserByOpenId( SysUser sysUser);
+
+    /**
+     * 通过手机号码查询用户
+     *
+     * @param phoneNumber 手机号码
+     * @return 用户对象信息
+     */
+    public SysUser selectUserByPhoneNumber(String phoneNumber);
 }

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -603,7 +603,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     @Override
     public SysUser selectUserByOpenId(SysUser sysUser) {
-        return userMapper.selectUserByOpenId(sysUser.getUserName(), sysUser.getOpenId());
+        return userMapper.selectUserByOpenId(sysUser.getPhonenumber(), sysUser.getOpenId());
     }
 
     /**
@@ -702,4 +702,9 @@ public class SysUserServiceImpl implements ISysUserService
         user.setCreateTime(DateUtils.getNowDate());
         return user;
     }
+
+    @Override
+    public SysUser selectUserByPhoneNumber(String phoneNumber) {
+        return userMapper.selectUserByPhoneNumber(phoneNumber);
+    }
 }

jd-logistics-modules/jd-logistics-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -230,6 +230,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectUserByOpenId" parameterType="String" resultMap="SysUserResult">
         <include refid="selectUserVo"/>
-        where u.phonenumber = #{userName} and u.open_id = #{openId} and u.del_flag = '0'
+        where u.phonenumber = #{phoneNumber} and u.open_id = #{openId} and u.del_flag = '0'
+    </select>
+
+    <select id="selectUserByPhoneNumber" parameterType="String" resultMap="SysUserResult">
+        <include refid="selectUserVo"/>
+        where u.phonenumber = #{phoneNumber} and u.del_flag = '0'
     </select>
 </mapper>