Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
X
xyqb-user2
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
head_group
xyqb-user2
Commits
1109b486
Commit
1109b486
authored
Feb 13, 2017
by
zhouqian
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加ext info接口。
parent
5374120c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
55 additions
and
5 deletions
+55
-5
InnerController.java
...tgroup/xyqb/controller/external/user/InnerController.java
+2
-5
UserExtInfoRet.java
src/main/java/cn/quantgroup/xyqb/model/UserExtInfoRet.java
+53
-0
No files found.
src/main/java/cn/quantgroup/xyqb/controller/external/user/InnerController.java
View file @
1109b486
...
@@ -3,10 +3,7 @@ package cn.quantgroup.xyqb.controller.external.user;
...
@@ -3,10 +3,7 @@ package cn.quantgroup.xyqb.controller.external.user;
import
cn.quantgroup.xyqb.entity.User
;
import
cn.quantgroup.xyqb.entity.User
;
import
cn.quantgroup.xyqb.entity.UserDetail
;
import
cn.quantgroup.xyqb.entity.UserDetail
;
import
cn.quantgroup.xyqb.entity.UserExtInfo
;
import
cn.quantgroup.xyqb.entity.UserExtInfo
;
import
cn.quantgroup.xyqb.model.UserDetailRet
;
import
cn.quantgroup.xyqb.model.*
;
import
cn.quantgroup.xyqb.model.UserRet
;
import
cn.quantgroup.xyqb.model.IdType
;
import
cn.quantgroup.xyqb.model.JsonResult
;
import
cn.quantgroup.xyqb.service.auth.IIdCardService
;
import
cn.quantgroup.xyqb.service.auth.IIdCardService
;
import
cn.quantgroup.xyqb.service.user.IUserDetailService
;
import
cn.quantgroup.xyqb.service.user.IUserDetailService
;
import
cn.quantgroup.xyqb.service.user.IUserExtInfoService
;
import
cn.quantgroup.xyqb.service.user.IUserExtInfoService
;
...
@@ -207,7 +204,7 @@ public class InnerController {
...
@@ -207,7 +204,7 @@ public class InnerController {
if
(
userExtInfo
==
null
)
{
if
(
userExtInfo
==
null
)
{
return
JsonResult
.
buildErrorStateResult
(
null
,
null
);
return
JsonResult
.
buildErrorStateResult
(
null
,
null
);
}
}
return
JsonResult
.
buildSuccessResult
(
"success"
,
userExtInfo
);
return
JsonResult
.
buildSuccessResult
(
"success"
,
UserExtInfoRet
.
getUserExtInfoRet
(
userExtInfo
)
);
}
}
}
}
\ No newline at end of file
src/main/java/cn/quantgroup/xyqb/model/UserExtInfoRet.java
0 → 100644
View file @
1109b486
package
cn
.
quantgroup
.
xyqb
.
model
;
import
cn.quantgroup.xyqb.entity.UserExtInfo
;
import
cn.quantgroup.xyqb.entity.enumerate.EducationEnum
;
import
cn.quantgroup.xyqb.entity.enumerate.IncomeEnum
;
import
cn.quantgroup.xyqb.entity.enumerate.IncomeRangeEnum
;
import
cn.quantgroup.xyqb.entity.enumerate.OccupationEnum
;
import
lombok.Data
;
import
java.sql.Timestamp
;
/**
* Created by Miraculous on 2017/2/13.
*/
@Data
public
class
UserExtInfoRet
{
private
static
final
long
serialVersionUID
=
-
1L
;
private
Long
id
;
private
Long
userId
;
private
IncomeEnum
incomeEnum
;
private
IncomeRangeEnum
incomeRangeEnum
;
private
OccupationEnum
occupationEnum
;
private
EducationEnum
educationEnum
;
private
boolean
hasCar
;
private
boolean
hasSocialSecurity
;
private
boolean
hasHouse
;
private
boolean
hasCreditCard
;
private
boolean
marryStatus
;
private
Long
createdAt
;
private
Long
updateAt
;
public
static
UserExtInfoRet
getUserExtInfoRet
(
UserExtInfo
extInfo
)
{
if
(
extInfo
==
null
)
{
return
null
;
}
UserExtInfoRet
ret
=
new
UserExtInfoRet
();
ret
.
setUserId
(
extInfo
.
getUserId
());
ret
.
setId
(
extInfo
.
getId
());
ret
.
setIncomeEnum
(
extInfo
.
getIncomeEnum
());
ret
.
setIncomeRangeEnum
(
extInfo
.
getIncomeRangeEnum
());
ret
.
setOccupationEnum
(
extInfo
.
getOccupationEnum
());
ret
.
setEducationEnum
(
extInfo
.
getEducationEnum
());
ret
.
setHasCar
(
extInfo
.
isHasCar
());
ret
.
setHasSocialSecurity
(
extInfo
.
isHasSocialSecurity
());
ret
.
setHasHouse
(
extInfo
.
isHasHouse
());
ret
.
setHasCreditCard
(
extInfo
.
isHasCreditCard
());
ret
.
setMarryStatus
(
extInfo
.
isMarryStatus
());
ret
.
setCreatedAt
(
extInfo
.
getCreatedAt
().
getTime
());
ret
.
setUpdateAt
(
extInfo
.
getUpdateAt
().
getTime
());
return
ret
;
}
}
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