Merge branch 'feature/0823-logoff' of http://git.dayaedu.com/yonge/cooleshow

# Conflicts:
#	cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/dal/dao/SysUserDao.java

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/dal/dao/SysUserDao.java

@@ -175,4 +175,6 @@ public interface SysUserDao extends BaseDAO<Long, SysUser> {
     Long getTenantByClient(@Param("userId") Long userId, @Param("clientId") String clientId);
 
     SysUser getSysUserByOpenId(@Param("openId") String openId, @Param("clientId") String clientId);
+
+    int logoffByPhone(@Param("phone") String phone);
 }

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/SysUserService.java

@@ -6,6 +6,7 @@ import com.yonge.cooleshow.auth.api.dto.SysUserQueryInfo;
 import com.yonge.cooleshow.auth.api.dto.UserSetReq;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.auth.api.vo.UserSetVo;
+import com.yonge.cooleshow.auth.dal.dao.SysUserDao;
 import com.yonge.cooleshow.auth.enums.EClientType;
 import com.yonge.cooleshow.common.entity.ImUserModel;
 import com.yonge.toolset.mybatis.service.BaseService;
@@ -14,6 +15,8 @@ import java.util.List;
 
 public interface SysUserService extends BaseService<Long, SysUser> {
 
+    SysUserDao getDao();
+
     /**
      * 根据用户名查询对象
      *

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/impl/SysUserServiceImpl.java

@@ -75,6 +75,11 @@ public class SysUserServiceImpl extends BaseServiceImpl<Long, SysUser> implement
     }
 
     @Override
+    public SysUserDao getDao() {
+        return sysUserDao;
+    }
+
+    @Override
     public SysUser queryByUsername(String username) {
         return sysUserDao.queryByUsername(username);
     }

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/web/controller/UserController.java

@@ -440,7 +440,11 @@ public class UserController extends BaseController {
         if (!b) {
             throw new BadCredentialsException("验证码校验失败");
         }
-        sysUserService.logoffById(sysUser.getId());
+        int i = sysUserService.getDao().logoffByPhone(sysUser.getPhone());
+        if(i < 1){
+            throw new BizException("用户不存在或已注销");
+        }
+//        sysUserService.logoffById(sysUser.getId());
         return succeed(true);
     }
 

cooleshow-auth/auth-server/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -279,6 +279,9 @@
     <update id="logoffById">
         update sys_user set del_flag_ = 1, phone_ = concat('D', ${num}, '+', phone_) where id_ = ${userId}
     </update>
+    <update id="logoffByPhone">
+        update sys_user set del_flag_ = 1, phone_ = concat('D', phone_),update_time_ = now() where phone_ = ${phone}
+    </update>
     <select id="queryEmployeeList" resultMap="SysUser">
         select  su.*
         from employee e