From 880183edcf14844996e5f515b0c83c69c7dcb2d4 Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期一, 07 十二月 2020 11:27:12 +0800
Subject: [PATCH] 数据库所有主键修改为bigint

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java |   27 ++++++++++++++++++++++++++-
 1 files changed, 26 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
index b55497f..2e6f0cf 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -1,9 +1,11 @@
 package com.panzhihua.service_user.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.panzhihua.common.constants.UserConstants;
 import com.panzhihua.common.model.vos.LoginUserInfoVO;
 import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.user.ChangePasswordVO;
 import com.panzhihua.service_user.dao.RoleDAO;
 import com.panzhihua.service_user.dao.UserDao;
 import com.panzhihua.service_user.model.dos.SysRoleDO;
@@ -129,7 +131,9 @@
         if (1 == type) {
             sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getType, type).eq(SysUserDO::getOpenid, name));
         } else {
-            sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getType, type).eq(SysUserDO::getAccount, name).or().eq(SysUserDO::getPhone, name));
+            LambdaQueryWrapper<SysUserDO> wrapper = new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getType, type);
+            wrapper.and(sysUserDOLambdaQueryWrapper ->sysUserDOLambdaQueryWrapper .eq(SysUserDO::getAccount, name).or().eq(SysUserDO::getPhone, name));
+            sysUserDO = userDao.selectOne(wrapper);
         }
         boolean empty = ObjectUtils.isEmpty(sysUserDO);
         if (empty) {
@@ -184,6 +188,27 @@
         return R.ok(loginUserInfoVO);
     }
 
+    /**
+     * 修改用户登录密码
+     *
+     * @param changePasswordVO 新密码
+     * @return 修改结果
+     */
+    @Override
+    public R changePassword(ChangePasswordVO changePasswordVO) {
+        Long userId = changePasswordVO.getUserId();
+        String newPassword = changePasswordVO.getNewPassword();
+        SysUserDO sysUserDO=new SysUserDO();
+        sysUserDO.setUserId(userId);
+        String encode = new BCryptPasswordEncoder().encode(newPassword);
+        sysUserDO.setPassword(encode);
+        int update = userDao.updateById(sysUserDO);
+        if (update>0) {
+            return R.ok();
+        }
+        return R.fail();
+    }
+
     public static void main(String[] args) {
         String encode = new BCryptPasswordEncoder().encode("123456");
         System.out.println(encode);

--
Gitblit v1.7.1