From 3183d1a910d72eefb96d4cb72f556a54a5d2f874 Mon Sep 17 00:00:00 2001 From: jiangqs <jiangqs> Date: 星期四, 25 五月 2023 11:42:39 +0800 Subject: [PATCH] 完善数据库和框架 --- ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysUserServiceImpl.java | 47 +++++++++++++++++++++++++++++------------------ 1 files changed, 29 insertions(+), 18 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysUserServiceImpl.java index 405be71..17e8fda 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysUserServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysUserServiceImpl.java @@ -4,18 +4,13 @@ import java.util.Date; import java.util.List; import java.util.stream.Collectors; +import javax.annotation.Resource; import javax.validation.Validator; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.system.api.domain.dto.AppEditUserDto; -import com.ruoyi.system.api.domain.poji.member.Member; -import com.ruoyi.system.domain.pojo.coupon.Coupon; -import com.ruoyi.system.mapper.coupon.CouponMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; @@ -38,7 +33,6 @@ import com.ruoyi.system.mapper.sys.SysUserRoleMapper; import com.ruoyi.system.service.sys.ISysConfigService; import com.ruoyi.system.service.sys.ISysUserService; -import org.springframework.util.ObjectUtils; /** * 用户 业务层处理 @@ -50,25 +44,25 @@ { private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class); - @Autowired + @Resource private SysUserMapper userMapper; - @Autowired + @Resource private SysRoleMapper roleMapper; - @Autowired + @Resource private SysPostMapper postMapper; - @Autowired + @Resource private SysUserRoleMapper userRoleMapper; - @Autowired + @Resource private SysUserPostMapper userPostMapper; - @Autowired + @Resource private ISysConfigService configService; - @Autowired + @Resource protected Validator validator; /** @@ -85,13 +79,17 @@ } @Override - public SysUser selectUserByPhoneNumber(String phoneNumber) { + public SysUser selectUserByPhoneNumber(String phoneNumber,String userType) { SysUser sysUser = new SysUser(); sysUser.setPhonenumber(phoneNumber); List<SysUser> userList = this.selectUserList(sysUser); SysUser queryUser = null; if(!userList.isEmpty()){ - queryUser = userList.get(0); + for(SysUser sysUser1 : userList){ + if(sysUser1.getUserType().equals(userType)){ + queryUser = sysUser1; + } + } } return queryUser; } @@ -294,9 +292,22 @@ * @return 结果 */ @Override - public boolean registerUser(SysUser user) + public SysUser registerUser(SysUser user) { - return userMapper.insertUser(user) > 0; + int id = userMapper.insertUser(user); + log.info("user------------------"+user.toString()); + return user; + } + + /** + * + * @param mobile + * @return + */ + @Override + public SysUser getSysUserByMobile(String mobile){ + SysUser sysUser = this.selectUserByPhoneNumber(mobile,"00"); + return sysUser; } /** -- Gitblit v1.7.1