Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
V
volunteer_service
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
licc
volunteer_service
Commits
231dcee3
Commit
231dcee3
authored
Apr 15, 2021
by
xc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
登录bug修复,增加字段联合查询导致的
parent
7bafc6c6
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
26 additions
and
28 deletions
+26
-28
wisenergy-common.iml
wisenergy-common/wisenergy-common.iml
+0
-1
UsersMapper.xml
wisenergy-mapper/src/main/resources/mapper/UsersMapper.xml
+1
-0
wisenergy-mapper.iml
wisenergy-mapper/wisenergy-mapper.iml
+0
-1
wisenergy-model.iml
wisenergy-model/wisenergy-model.iml
+0
-1
SchemeServiceImpl.java
...java/cn/wisenergy/service/app/impl/SchemeServiceImpl.java
+2
-2
StaffUserVipServiceImpl.java
...n/wisenergy/service/app/impl/StaffUserVipServiceImpl.java
+4
-4
UserLoginServiceImpl.java
...a/cn/wisenergy/service/app/impl/UserLoginServiceImpl.java
+10
-10
UserServiceImpl.java
...n/java/cn/wisenergy/service/app/impl/UserServiceImpl.java
+3
-3
UserVipManager.java
...main/java/cn/wisenergy/service/common/UserVipManager.java
+6
-4
wisenergy-service.iml
wisenergy-service/wisenergy-service.iml
+0
-1
wisenergy-web-admin.iml
wisenergy-web-admin/wisenergy-web-admin.iml
+0
-1
No files found.
wisenergy-common/wisenergy-common.iml
View file @
231dcee3
...
@@ -177,6 +177,5 @@
...
@@ -177,6 +177,5 @@
<orderEntry
type=
"library"
name=
"Maven: cglib:cglib:3.1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: cglib:cglib:3.1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.ow2.asm:asm:4.2"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.ow2.asm:asm:4.2"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.ehcache:ehcache:3.6.3"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.ehcache:ehcache:3.6.3"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.apache.shiro:shiro-features:1.7.1"
level=
"project"
/>
</component>
</component>
</module>
</module>
\ No newline at end of file
wisenergy-mapper/src/main/resources/mapper/UsersMapper.xml
View file @
231dcee3
...
@@ -91,6 +91,7 @@
...
@@ -91,6 +91,7 @@
<where>
<where>
<if
test=
"phone != null and phone !=''"
>
and phone = #{phone}
</if>
<if
test=
"phone != null and phone !=''"
>
and phone = #{phone}
</if>
<if
test=
"is_delete != null and is_delete !=''"
>
and is_delete = #{is_delete}
</if>
<if
test=
"is_delete != null and is_delete !=''"
>
and is_delete = #{is_delete}
</if>
<if
test=
"vip_mobile != null and vip_mobile !=''"
>
and vip_mobile = #{vip_mobile}
</if>
</where>
</where>
</select>
</select>
...
...
wisenergy-mapper/wisenergy-mapper.iml
View file @
231dcee3
...
@@ -178,6 +178,5 @@
...
@@ -178,6 +178,5 @@
<orderEntry
type=
"library"
name=
"Maven: org.ow2.asm:asm:4.2"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.ow2.asm:asm:4.2"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.slf4j:slf4j-api:1.7.26"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.slf4j:slf4j-api:1.7.26"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.ehcache:ehcache:3.6.3"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.ehcache:ehcache:3.6.3"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.apache.shiro:shiro-features:1.7.1"
level=
"project"
/>
</component>
</component>
</module>
</module>
\ No newline at end of file
wisenergy-model/wisenergy-model.iml
View file @
231dcee3
...
@@ -176,6 +176,5 @@
...
@@ -176,6 +176,5 @@
<orderEntry
type=
"library"
name=
"Maven: org.ow2.asm:asm:4.2"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.ow2.asm:asm:4.2"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.slf4j:slf4j-api:1.7.26"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.slf4j:slf4j-api:1.7.26"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.ehcache:ehcache:3.6.3"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.ehcache:ehcache:3.6.3"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.apache.shiro:shiro-features:1.7.1"
level=
"project"
/>
</component>
</component>
</module>
</module>
\ No newline at end of file
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/SchemeServiceImpl.java
View file @
231dcee3
...
@@ -84,7 +84,7 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
...
@@ -84,7 +84,7 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
}
}
//1、根据userId获取用户信息
//1、根据userId获取用户信息
User
user
=
usersMapper
.
selec
tById
(
queryVo
.
getUserId
());
User
user
=
usersMapper
.
ge
tById
(
queryVo
.
getUserId
());
if
(
null
==
user
)
{
if
(
null
==
user
)
{
return
R
.
error
(
"用户信息不存在!"
);
return
R
.
error
(
"用户信息不存在!"
);
}
}
...
@@ -405,7 +405,7 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
...
@@ -405,7 +405,7 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
List
<
String
>
locals
=
StringUtil
.
strToArrayStr
(
schemeVo
.
getLocal
());
List
<
String
>
locals
=
StringUtil
.
strToArrayStr
(
schemeVo
.
getLocal
());
//1、根据userId获取用户信息
//1、根据userId获取用户信息
User
user
=
usersMapper
.
selec
tById
(
schemeVo
.
getUserId
());
User
user
=
usersMapper
.
ge
tById
(
schemeVo
.
getUserId
());
if
(
null
==
user
)
{
if
(
null
==
user
)
{
return
R
.
error
(
"请先添加vip客户信息!"
);
return
R
.
error
(
"请先添加vip客户信息!"
);
}
}
...
...
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/StaffUserVipServiceImpl.java
View file @
231dcee3
...
@@ -272,7 +272,7 @@ public class StaffUserVipServiceImpl extends ServiceImpl<LocalMapper, Local> imp
...
@@ -272,7 +272,7 @@ public class StaffUserVipServiceImpl extends ServiceImpl<LocalMapper, Local> imp
user
.
setUpdateTime
(
new
Date
());
user
.
setUpdateTime
(
new
Date
());
user
.
setUserName
(
staffAddDto
.
getUserName
());
user
.
setUserName
(
staffAddDto
.
getUserName
());
user
.
setVipMobile
(
staffAddDto
.
getVipMobile
());
user
.
setVipMobile
(
staffAddDto
.
getVipMobile
());
int
addUser
=
usersMapper
.
insert
(
user
);
int
addUser
=
usersMapper
.
add
(
user
);
if
(
addUser
==
0
){
if
(
addUser
==
0
){
return
R
.
error
(
"添加失败"
);
return
R
.
error
(
"添加失败"
);
}
}
...
@@ -335,9 +335,9 @@ public class StaffUserVipServiceImpl extends ServiceImpl<LocalMapper, Local> imp
...
@@ -335,9 +335,9 @@ public class StaffUserVipServiceImpl extends ServiceImpl<LocalMapper, Local> imp
public
boolean
getUserInfo
(
String
vipMobile
){
public
boolean
getUserInfo
(
String
vipMobile
){
QueryWrapper
<
User
>
objectQueryWrapper
=
new
QueryWrapper
<>(
);
Map
<
String
,
Object
>
map
=
new
HashMap
<>(
16
);
objectQueryWrapper
.
eq
(
"vip_mobile"
,
vipMobile
);
map
.
put
(
"vip_mobile"
,
vipMobile
);
User
user
=
usersMapper
.
selectOne
(
objectQueryWrapper
);
User
user
=
usersMapper
.
selectOne
(
map
);
if
(
null
==
user
){
if
(
null
==
user
){
return
true
;
return
true
;
}
}
...
...
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserLoginServiceImpl.java
View file @
231dcee3
...
@@ -201,10 +201,10 @@ public class UserLoginServiceImpl extends ServiceImpl<UsersMapper, User> impleme
...
@@ -201,10 +201,10 @@ public class UserLoginServiceImpl extends ServiceImpl<UsersMapper, User> impleme
@Override
@Override
public
R
<
UserInfoVo
>
loginTest
(
UserLoginVo
userLoginVo
,
HttpServletRequest
request
)
throws
Exception
{
public
R
<
UserInfoVo
>
loginTest
(
UserLoginVo
userLoginVo
,
HttpServletRequest
request
)
throws
Exception
{
//1、根据手机号,获取用户信息
//1、根据手机号,获取用户信息
QueryWrapper
<
User
>
queryWrapper
=
new
QueryWrapper
<>(
);
Map
<
String
,
Object
>
map
=
new
HashMap
<>(
16
);
queryWrapper
.
eq
(
"phone"
,
userLoginVo
.
getPhone
());
map
.
put
(
"phone"
,
userLoginVo
.
getPhone
());
queryWrapper
.
eq
(
"is_delete"
,
0
);
map
.
put
(
"is_delete"
,
0
);
User
user
=
usersMapper
.
selectOne
(
queryWrapper
);
User
user
=
usersMapper
.
selectOne
(
map
);
Subject
subject
=
SecurityUtils
.
getSubject
();
Subject
subject
=
SecurityUtils
.
getSubject
();
String
credentialsSalt
=
Md5Util
.
digestMD5
(
userLoginVo
.
getPassword
()
+
userLoginVo
.
getPhone
());
String
credentialsSalt
=
Md5Util
.
digestMD5
(
userLoginVo
.
getPassword
()
+
userLoginVo
.
getPhone
());
...
@@ -258,7 +258,7 @@ public class UserLoginServiceImpl extends ServiceImpl<UsersMapper, User> impleme
...
@@ -258,7 +258,7 @@ public class UserLoginServiceImpl extends ServiceImpl<UsersMapper, User> impleme
}
}
//1、获取用户信息
//1、获取用户信息
User
user
=
usersMapper
.
selec
tById
(
updateVo
.
getUserId
());
User
user
=
usersMapper
.
ge
tById
(
updateVo
.
getUserId
());
if
(
null
==
user
)
{
if
(
null
==
user
)
{
return
R
.
error
(
"用户信息不存在,无法修改密码!"
);
return
R
.
error
(
"用户信息不存在,无法修改密码!"
);
}
}
...
@@ -287,7 +287,7 @@ public class UserLoginServiceImpl extends ServiceImpl<UsersMapper, User> impleme
...
@@ -287,7 +287,7 @@ public class UserLoginServiceImpl extends ServiceImpl<UsersMapper, User> impleme
}
}
//获取用户信息
//获取用户信息
User
user
=
usersMapper
.
selec
tById
(
userId
);
User
user
=
usersMapper
.
ge
tById
(
userId
);
//加密重置密码
//加密重置密码
String
password
=
Md5Util
.
digestMD5
(
Common
.
RESET_PASSWORD_VALUE
+
user
.
getPhone
());
String
password
=
Md5Util
.
digestMD5
(
Common
.
RESET_PASSWORD_VALUE
+
user
.
getPhone
());
...
@@ -360,10 +360,10 @@ public class UserLoginServiceImpl extends ServiceImpl<UsersMapper, User> impleme
...
@@ -360,10 +360,10 @@ public class UserLoginServiceImpl extends ServiceImpl<UsersMapper, User> impleme
//1、注册-新增
//1、注册-新增
if
(
null
==
userId
)
{
if
(
null
==
userId
)
{
//根据电话号码查询用户
//根据电话号码查询用户
QueryWrapper
<
User
>
queryWrapper
=
new
QueryWrapper
<>(
);
Map
<
String
,
Object
>
map
=
new
HashMap
<>(
16
);
queryWrapper
.
eq
(
"phone"
,
phone
);
map
.
put
(
"phone"
,
phone
);
queryWrapper
.
eq
(
"is_delete"
,
0
);
map
.
put
(
"is_delete"
,
0
);
User
user
=
usersMapper
.
selectOne
(
queryWrapper
);
User
user
=
usersMapper
.
selectOne
(
map
);
if
(
null
!=
user
)
{
if
(
null
!=
user
)
{
return
false
;
return
false
;
}
}
...
...
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserServiceImpl.java
View file @
231dcee3
...
@@ -143,7 +143,7 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
...
@@ -143,7 +143,7 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
}
}
userInfo
.
setUserName
(
userInfo
.
getUserName
().
replace
(
" "
,
""
));
userInfo
.
setUserName
(
userInfo
.
getUserName
().
replace
(
" "
,
""
));
//1、根据用户id,获取用户信息
//1、根据用户id,获取用户信息
User
user
=
usersMapper
.
selec
tById
(
userInfo
.
getUserId
());
User
user
=
usersMapper
.
ge
tById
(
userInfo
.
getUserId
());
if
(
null
==
user
)
{
if
(
null
==
user
)
{
return
R
.
error
(
"用户信息不存在!"
);
return
R
.
error
(
"用户信息不存在!"
);
}
}
...
@@ -201,7 +201,7 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
...
@@ -201,7 +201,7 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
}
}
userDto
.
setUserName
(
userDto
.
getUserName
().
replace
(
" "
,
""
));
userDto
.
setUserName
(
userDto
.
getUserName
().
replace
(
" "
,
""
));
//1、根据用户id,获取用户信息
//1、根据用户id,获取用户信息
User
user
=
usersMapper
.
selec
tById
(
userDto
.
getUserId
());
User
user
=
usersMapper
.
ge
tById
(
userDto
.
getUserId
());
if
(
null
==
user
)
{
if
(
null
==
user
)
{
return
R
.
error
(
"用户信息不存在!"
);
return
R
.
error
(
"用户信息不存在!"
);
}
}
...
@@ -254,7 +254,7 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
...
@@ -254,7 +254,7 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
}
}
//根据id,获取用户信息
//根据id,获取用户信息
User
user
=
usersMapper
.
selec
tById
(
id
);
User
user
=
usersMapper
.
ge
tById
(
id
);
if
(
null
==
user
)
{
if
(
null
==
user
)
{
return
R
.
error
(
"用户信息不存在!"
);
return
R
.
error
(
"用户信息不存在!"
);
}
}
...
...
wisenergy-service/src/main/java/cn/wisenergy/service/common/UserVipManager.java
View file @
231dcee3
...
@@ -22,7 +22,9 @@ import org.springframework.transaction.annotation.Propagation;
...
@@ -22,7 +22,9 @@ import org.springframework.transaction.annotation.Propagation;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.transaction.annotation.Transactional
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
@Component
@Component
...
@@ -68,10 +70,10 @@ public class UserVipManager {
...
@@ -68,10 +70,10 @@ public class UserVipManager {
public
User
checkPhone
(
String
phone
)
{
public
User
checkPhone
(
String
phone
)
{
//根据电话号码查询用户
//根据电话号码查询用户
QueryWrapper
<
User
>
queryWrapper
=
new
QueryWrapper
<>(
);
Map
<
String
,
Object
>
map
=
new
HashMap
<>(
16
);
queryWrapper
.
eq
(
"phone"
,
phone
);
map
.
put
(
"phone"
,
phone
);
queryWrapper
.
eq
(
"is_delete"
,
0
);
map
.
put
(
"is_delete"
,
0
);
User
user
=
usersMapper
.
selectOne
(
queryWrapper
);
User
user
=
usersMapper
.
selectOne
(
map
);
if
(
null
!=
user
)
{
if
(
null
!=
user
)
{
return
user
;
return
user
;
}
}
...
...
wisenergy-service/wisenergy-service.iml
View file @
231dcee3
...
@@ -214,6 +214,5 @@
...
@@ -214,6 +214,5 @@
<orderEntry
type=
"library"
name=
"Maven: cglib:cglib:3.1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: cglib:cglib:3.1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.ow2.asm:asm:4.2"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.ow2.asm:asm:4.2"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.ehcache:ehcache:3.6.3"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.ehcache:ehcache:3.6.3"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.apache.shiro:shiro-features:1.7.1"
level=
"project"
/>
</component>
</component>
</module>
</module>
\ No newline at end of file
wisenergy-web-admin/wisenergy-web-admin.iml
View file @
231dcee3
...
@@ -216,6 +216,5 @@
...
@@ -216,6 +216,5 @@
<orderEntry
type=
"library"
name=
"Maven: cglib:cglib:3.1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: cglib:cglib:3.1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.ow2.asm:asm:4.2"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.ow2.asm:asm:4.2"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.ehcache:ehcache:3.6.3"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.ehcache:ehcache:3.6.3"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.apache.shiro:shiro-features:1.7.1"
level=
"project"
/>
</component>
</component>
</module>
</module>
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment