From d6e5d5a71112fb1f0a7361485e80692cc03bc4c3 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 13 六月 2023 19:01:48 +0800
Subject: [PATCH] 优惠券管理
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysUserServiceImpl.java | 26 ++++++++++++--------------
1 files changed, 12 insertions(+), 14 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 d5bf2e3..c3988b5 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
@@ -7,16 +7,11 @@
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.common.core.utils.DateUtils;
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;
@@ -39,7 +34,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;
/**
* 用户 业务层处理
@@ -86,13 +80,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;
}
@@ -308,8 +306,8 @@
* @return
*/
@Override
- public SysUser getSysUserBYmobile(String mobile){
- SysUser sysUser = this.selectUserByPhoneNumber(mobile);
+ public SysUser getSysUserByMobile(String mobile){
+ SysUser sysUser = this.selectUserByPhoneNumber(mobile,"00");
return sysUser;
}
@@ -605,19 +603,19 @@
switch (editType){
case 1:
sysUser.setNickName(editValue);
- sysUser.setUpdateTime(new Date());
+ sysUser.setUpdateTime(DateUtils.getNowDate());
sysUser.setUpdateBy(String.valueOf(appEditUserDto.getUserId()));
userMapper.updateUser(sysUser);
break;
case 2:
sysUser.setAvatar(editValue);
- sysUser.setUpdateTime(new Date());
+ sysUser.setUpdateTime(DateUtils.getNowDate());
sysUser.setUpdateBy(String.valueOf(appEditUserDto.getUserId()));
userMapper.updateUser(sysUser);
break;
case 3:
sysUser.setSex(editValue);
- sysUser.setUpdateTime(new Date());
+ sysUser.setUpdateTime(DateUtils.getNowDate());
sysUser.setUpdateBy(String.valueOf(appEditUserDto.getUserId()));
userMapper.updateUser(sysUser);
break;
--
Gitblit v1.7.1