Commit 1109b486 authored by zhouqian's avatar zhouqian

增加ext info接口。

parent 5374120c
...@@ -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
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;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment