Commit cab96047 authored by 杨锐's avatar 杨锐

add 查询用户全量信息 for koala.

parent 784af0ce
...@@ -341,13 +341,43 @@ public class UserServiceImpl implements IUserService, IBaseController { ...@@ -341,13 +341,43 @@ public class UserServiceImpl implements IUserService, IBaseController {
@Override @Override
public UserFullResp findUserFullSearchByUserId(Long userId) { public UserFullResp findUserFullSearchByUserId(Long userId) {
User user = userRepository.findById(userId); User user = userRepository.findById(userId);
if (user == null) {
throw new DataException("用户userId = 【" + userId + "】不存在");
}
UserDetail userDetail = userDetailService.findByUserId(userId); UserDetail userDetail = userDetailService.findByUserId(userId);
UserExtInfo userExtInfo = userExtInfoService.findByUserId(userId); UserExtInfo userExtInfo = userExtInfoService.findByUserId(userId);
Address address = addressService.findByUserId(userId); Address address = addressService.findByUserId(userId);
UserFullResp userFullResp = UserFullResp.builder().userId(userId).build();
if (user != null) {
userFullResp.setUuid(user.getUuid());
}
if (userDetail != null) {
userFullResp.setPhoneNo(userDetail.getPhoneNo());
userFullResp.setName(userDetail.getName());
userFullResp.setIdNo(userDetail.getIdNo());
userFullResp.setIdType(userDetail.getIdType().ordinal());
userFullResp.setGender(userDetail.getGender().ordinal());
userFullResp.setEmail(userDetail.getEmail());
userFullResp.setQq(userDetail.getQq());
}
if (userExtInfo != null) {
userFullResp.setIncomeType(userExtInfo.getIncomeEnum().ordinal());
userFullResp.setIncomeRange(userExtInfo.getIncomeRangeEnum().ordinal());
userFullResp.setOccupation(userExtInfo.getOccupationEnum().ordinal());
userFullResp.setEducation(userExtInfo.getEducationEnum().ordinal());
userFullResp.setHasCar(userExtInfo.getHasCar() ? 1 : 0);
userFullResp.setHasSocialSecurity(userExtInfo.getHasSocialSecurity() ? 1 : 0);
userFullResp.setHasHouse(userExtInfo.getHasHouse() ? 1 : 0);
userFullResp.setHasCreditCard(userExtInfo.getHasCreditCard() ? 1 : 0);
userFullResp.setMarryStatus(userExtInfo.getMarryStatus().ordinal());
}
if (address != null) {
userFullResp.setProvinceCode(address.getProvinceCode());
userFullResp.setProvince(address.getProvince());
userFullResp.setCityCode(address.getCityCode());
userFullResp.setCity(address.getCity());
userFullResp.setDistrictCode(address.getDistrictCode());
userFullResp.setDistrict(address.getDistrict());
userFullResp.setAddress(address.getAddress());
}
List<UserFullResp.Contact> contacts = Lists.newArrayList(); List<UserFullResp.Contact> contacts = Lists.newArrayList();
contactService.findByUserId(userId, true).forEach(contact -> { contactService.findByUserId(userId, true).forEach(contact -> {
contacts.add(UserFullResp.Contact.builder() contacts.add(UserFullResp.Contact.builder()
...@@ -357,33 +387,7 @@ public class UserServiceImpl implements IUserService, IBaseController { ...@@ -357,33 +387,7 @@ public class UserServiceImpl implements IUserService, IBaseController {
.relation(contact.getRelation().ordinal()) .relation(contact.getRelation().ordinal())
.build()); .build());
}); });
return UserFullResp.builder() userFullResp.setContacts(contacts);
.userId(userId) return userFullResp;
.uuid(user.getUuid())
.phoneNo(userDetail.getPhoneNo())
.name(userDetail.getName())
.idNo(userDetail.getIdNo())
.idType(userDetail.getIdType().ordinal())
.gender(userDetail.getGender().ordinal())
.email(userDetail.getEmail())
.qq(userDetail.getQq())
.incomeType(userExtInfo.getIncomeEnum().ordinal())
.incomeRange(userExtInfo.getIncomeRangeEnum().ordinal())
.occupation(userExtInfo.getOccupationEnum().ordinal())
.education(userExtInfo.getEducationEnum().ordinal())
.hasCar(userExtInfo.getHasCar() ? 1 : 0)
.hasSocialSecurity(userExtInfo.getHasSocialSecurity() ? 1 : 0)
.hasHouse(userExtInfo.getHasHouse() ? 1 : 0)
.hasCreditCard(userExtInfo.getHasCreditCard() ? 1 : 0)
.marryStatus(userExtInfo.getMarryStatus().ordinal())
.provinceCode(address.getProvinceCode())
.province(address.getProvince())
.cityCode(address.getCityCode())
.city(address.getCity())
.districtCode(address.getDistrictCode())
.district(address.getDistrict())
.address(address.getAddress())
.contacts(contacts)
.build();
} }
} }
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