Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
wangming
/
kzy-wx
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit d4280826
authored
Mar 16, 2020
by
魏文甫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
1 parent
ce8e81c4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
3 deletions
src/main/java/com/server/web/common/service/Impl/UserServiceImpl.java
src/main/java/com/server/web/controller/UserController.java
src/main/java/com/server/web/common/service/Impl/UserServiceImpl.java
View file @
d428082
...
@@ -100,6 +100,8 @@ public class UserServiceImpl implements UserService {
...
@@ -100,6 +100,8 @@ public class UserServiceImpl implements UserService {
tKzyUserMapper
.
updateByPrimaryKeySelective
(
loginUser
);
tKzyUserMapper
.
updateByPrimaryKeySelective
(
loginUser
);
tKzyUserIntegralFlowingMapper
.
insertSelective
(
tKzyUserIntegralFlowing
);
tKzyUserIntegralFlowingMapper
.
insertSelective
(
tKzyUserIntegralFlowing
);
Map
<
String
,
Object
>
dataMap
=
new
HashMap
<>();
Map
<
String
,
Object
>
dataMap
=
new
HashMap
<>();
dataMap
.
put
(
"integral"
,
integral
);
dataMap
.
put
(
"integral"
,
integral
);
dataMap
.
put
(
"signInCount"
,
loginUser
.
getSignInCount
());
dataMap
.
put
(
"signInCount"
,
loginUser
.
getSignInCount
());
...
...
src/main/java/com/server/web/controller/UserController.java
View file @
d428082
...
@@ -35,9 +35,7 @@ public class UserController extends BaseController {
...
@@ -35,9 +35,7 @@ public class UserController extends BaseController {
@RequestMapping
(
value
=
"/userData"
,
method
=
{
RequestMethod
.
POST
,
RequestMethod
.
GET
},
produces
=
"application/json"
)
@RequestMapping
(
value
=
"/userData"
,
method
=
{
RequestMethod
.
POST
,
RequestMethod
.
GET
},
produces
=
"application/json"
)
public
Map
userData
(
HttpServletRequest
request
)
{
public
Map
userData
(
HttpServletRequest
request
)
{
TKzyUser
loginUser
=
getLoginUser
(
request
);
TKzyUser
loginUser
=
getLoginUser
(
request
);
if
(
loginUser
!=
null
&&
loginUser
.
getId
()
!=
null
)
{
loginUser
=
tKzyUserMapper
.
selectByPrimaryKey
(
loginUser
.
getId
());
}
return
returnSuccess
(
loginUser
);
return
returnSuccess
(
loginUser
);
}
}
...
@@ -234,6 +232,11 @@ public class UserController extends BaseController {
...
@@ -234,6 +232,11 @@ public class UserController extends BaseController {
if
(
loginUser
==
null
||
loginUser
.
getId
()
==
null
)
{
if
(
loginUser
==
null
||
loginUser
.
getId
()
==
null
)
{
return
ResultMapUtil
.
returnMap
(
"0"
,
"请先登录!"
,
null
);
return
ResultMapUtil
.
returnMap
(
"0"
,
"请先登录!"
,
null
);
}
}
if
(
loginUser
!=
null
&&
loginUser
.
getId
()
!=
null
)
{
loginUser
=
tKzyUserMapper
.
selectByPrimaryKey
(
loginUser
.
getId
());
}
//更新缓存用户信息(主要积分金额)
request
.
getSession
().
setAttribute
(
WX_USER_SESSION_KEY
,
loginUser
);
return
userService
.
signIn
(
loginUser
);
return
userService
.
signIn
(
loginUser
);
}
}
...
...
Write
Preview
Markdown
is supported
Attach a file
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 post a comment