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 8f6e8099
authored
Mar 14, 2020
by
魏文甫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
1 parent
b729b12c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
4 deletions
src/main/java/com/server/web/controller/UserController.java
src/main/resources/mybatis/mapping/IntegralMapper.xml
src/main/java/com/server/web/controller/UserController.java
View file @
8f6e809
...
...
@@ -3,6 +3,7 @@ package com.server.web.controller;
import
com.server.utils.ResultMapUtil
;
import
com.server.utils.SendSMSUtil
;
import
com.server.utils.VerifyCodeUtils
;
import
com.server.web.common.mapper.TKzyUserMapper
;
import
com.server.web.common.model.TKzyUser
;
import
com.server.web.common.model.TKzyUserExample
;
import
com.server.web.common.service.UserService
;
...
...
@@ -26,11 +27,16 @@ import java.util.concurrent.TimeUnit;
public
class
UserController
extends
BaseController
{
@Autowired
UserService
userService
;
@Autowired
private
TKzyUserMapper
tKzyUserMapper
;
@PostMapping
(
"/userData"
)
public
Map
userData
(
HttpServletRequest
request
)
{
TKzyUser
loginUser
=
getLoginUser
(
request
);
if
(
loginUser
!=
null
&&
loginUser
.
getId
()
!=
null
)
{
loginUser
=
tKzyUserMapper
.
selectByPrimaryKey
(
loginUser
.
getId
());
}
return
returnSuccess
(
loginUser
);
}
...
...
@@ -222,7 +228,7 @@ public class UserController extends BaseController {
* @return
*/
@ResponseBody
@RequestMapping
(
value
=
"/signIn"
,
method
=
{
RequestMethod
.
POST
,
RequestMethod
.
GET
},
produces
=
"application/json"
)
@RequestMapping
(
value
=
"/signIn"
,
method
=
{
RequestMethod
.
POST
,
RequestMethod
.
GET
},
produces
=
"application/json"
)
public
Map
<
String
,
Object
>
signIn
(
HttpServletRequest
request
)
{
TKzyUser
loginUser
=
getLoginUser
(
request
);
if
(
loginUser
==
null
||
loginUser
.
getId
()
==
null
)
{
...
...
@@ -238,7 +244,7 @@ public class UserController extends BaseController {
* @return
*/
@ResponseBody
@RequestMapping
(
value
=
"/signInList"
,
method
=
{
RequestMethod
.
POST
,
RequestMethod
.
GET
},
produces
=
"application/json"
)
@RequestMapping
(
value
=
"/signInList"
,
method
=
{
RequestMethod
.
POST
,
RequestMethod
.
GET
},
produces
=
"application/json"
)
public
Map
<
String
,
Object
>
signInList
(
HttpServletRequest
request
)
{
TKzyUser
loginUser
=
getLoginUser
(
request
);
if
(
loginUser
==
null
||
loginUser
.
getId
()
==
null
)
{
...
...
src/main/resources/mybatis/mapping/IntegralMapper.xml
View file @
8f6e809
...
...
@@ -24,7 +24,7 @@
WHERE
t.source_type = 1
AND t.user_id = #{userId,jdbcType=BIGINT}
AND DATE_FORMAT(t.create_dt, '%Y-%m-%') = #{tod
ya
,jdbcType=VARCHAR}
limit
t.id DESC limit 0,1
AND DATE_FORMAT(t.create_dt, '%Y-%m-%') = #{tod
ay
,jdbcType=VARCHAR}
ORDER BY
t.id DESC limit 0,1
</select>
</mapper>
\ No newline at end of file
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