From fd7b8fb7c89832c28a838b0449bbb8a392433ee2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 22 四月 2025 14:33:02 +0800
Subject: [PATCH] 将华为云短信替换成阿里云短信

---
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java |   28 +++++++++++++++++++++++-----
 1 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index 5098818..4a467b6 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -1,5 +1,6 @@
 package com.ruoyi.system.service.impl;
 
+import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.account.api.feignClient.AppUserClient;
@@ -137,6 +138,10 @@
 	public SysUser selectUserByUserName(String userName) {
 		return userMapper.selectUserByUserName(userName);
 	}
+	@Override
+	public SysUser selectUserShopByUserName(String userName) {
+		return userMapper.selectUserShopByUserName(userName);
+	}
 	
 	/**
 	 * 通过用户ID查询用户
@@ -188,13 +193,22 @@
 	@Override
 	public boolean checkUserNameUnique(SysUser user) {
 		Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
-		SysUser info = userMapper.checkUserNameUnique(user.getUserName());
+		SysUser info = userMapper.checkUserNameUnique(user);
 		if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
 			return UserConstants.NOT_UNIQUE;
 		}
 		return UserConstants.UNIQUE;
 	}
-	
+
+	@Override
+	public boolean checkNickNameUnique(SysUser user) {
+		SysUser info = userMapper.checkNickNameUnique(user);
+		if (StringUtils.isNotNull(info) ) {
+			return UserConstants.NOT_UNIQUE;
+		}
+		return UserConstants.UNIQUE;
+	}
+
 	/**
 	 * 校验手机号码是否唯一
 	 *
@@ -204,7 +218,7 @@
 	@Override
 	public boolean checkPhoneUnique(SysUser user) {
 		Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
-		SysUser info = userMapper.checkPhoneUnique(user.getPhonenumber());
+		SysUser info = userMapper.checkPhoneUnique(user);
 		if (StringUtils.isNotNull(info)) {
 			return UserConstants.NOT_UNIQUE;
 		}
@@ -368,6 +382,10 @@
 	public int resetUserPwd(String userName, String password) {
 		return userMapper.resetUserPwd(userName, password);
 	}
+	@Override
+	public int resetUserShopPwd(String userName, String password) {
+		return userMapper.resetUserShopPwd(userName, password);
+	}
 	
 	/**
 	 * 新增用户角色信息
@@ -441,7 +459,8 @@
 	 * @return 结果
 	 */
 	@Override
-	public int deleteUserByIds(Long[] userIds) {
+	@Transactional(rollbackFor = Exception.class)
+	public void deleteUserByIds(Long[] userIds) {
         Long userid = tokenService.getLoginUser().getUserid();
         SysUser sysUser = this.getById(userid);
         for (Long userId : userIds) {
@@ -471,7 +490,6 @@
 				userMapper.deleteUserById(user.getUserId());
             }
 		}
-		return 0;
 	}
 	
 	/**

--
Gitblit v1.7.1