给催收增加查询接口

src/main/java/cn/quantgroup/xyqb/controller/external/user/InnerController.java

 package cn.quantgroup.xyqb.controller.external.user;
 
+import cn.quantgroup.motan.bean.UserAssociationBean;
+import cn.quantgroup.motan.retbean.XContact;
 import cn.quantgroup.xyqb.aspect.logcaller.LogHttpCaller;
 import cn.quantgroup.xyqb.controller.IBaseController;
 import cn.quantgroup.xyqb.entity.Address;
@@ -16,6 +18,7 @@ import cn.quantgroup.xyqb.entity.enumerate.MaritalStatus;
 import cn.quantgroup.xyqb.entity.enumerate.OccupationEnum;
 import cn.quantgroup.xyqb.model.AddressRet;
 import cn.quantgroup.xyqb.model.ContactRet;
+import cn.quantgroup.xyqb.model.Gender;
 import cn.quantgroup.xyqb.model.IdType;
 import cn.quantgroup.xyqb.model.JsonResult;
 import cn.quantgroup.xyqb.model.UserDetailRet;
@@ -45,6 +48,7 @@ import com.google.common.base.MoreObjects;
 import com.google.common.collect.ImmutableMap;
 import java.sql.Timestamp;
 import java.text.ParseException;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -151,16 +155,17 @@ public class InnerController implements IBaseController {
       return JsonResult.buildSuccessResult(null, null);
     }
     User user = userService.findByUuidInDb(uuid);
-    if(null!=user){
-      if(!user.getEnable()){
+    if (null != user) {
+      if (!user.getEnable()) {
         return JsonResult.buildSuccessResult("", null);
       }
       UserDetail userDetail = userDetailService.findByUserId(user.getId());
-      UserInfo info = new UserInfo(user,userDetail);
+      UserInfo info = new UserInfo(user, userDetail);
       return JsonResult.buildSuccessResult("", info);
     }
     return JsonResult.buildSuccessResult("", null);
   }
+
   @RequestMapping("/userInfo/search/phone")
   @LogHttpCaller
   public JsonResult findUserInfoByPhone(@RequestParam(value = "phone") String phone) {
@@ -170,18 +175,17 @@ public class InnerController implements IBaseController {
       return JsonResult.buildSuccessResult(null, null);
     }
     User user = userService.findByPhoneInDb(phone);
-    if(null!=user){
-      if(!user.getEnable()){
+    if (null != user) {
+      if (!user.getEnable()) {
         return JsonResult.buildSuccessResult("", null);
       }
       UserDetail userDetail = userDetailService.findByUserId(user.getId());
-      UserInfo info = new UserInfo(user,userDetail);
+      UserInfo info = new UserInfo(user, userDetail);
       return JsonResult.buildSuccessResult("", info);
     }
     return JsonResult.buildSuccessResult("", null);
   }
 
-
   @RequestMapping("/user/getPhoneByUserIds")
   @LogHttpCaller
   public JsonResult findByIds(@RequestParam(value = "userIds") String userIdsString) {
@@ -199,6 +203,83 @@ public class InnerController implements IBaseController {
     }
   }
 
+  @RequestMapping("/user-association/search/phone")
+  @LogHttpCaller
+  public JsonResult findUserAssociationByPhone(String phoneNo) {
+    UserDetail userDetail = userDetailService.findByPhoneNo(phoneNo);
+    UserAssociationBean bean = new UserAssociationBean();
+
+    if (null != userDetail) {
+      Address address = addressService.findByUserId(userDetail.getUserId());
+      List<Contact> contacts = contactService.findByUserId(userDetail.getUserId());
+      UserExtInfo extInfo = userExtInfoService.findByUserId(userDetail.getUserId());
+      bean.setUserId(userDetail.getUserId());
+      bean.setPhoneNo(userDetail.getPhoneNo());
+      bean.setName(userDetail.getName());
+      bean.setIdNo(userDetail.getIdNo());
+      bean.setQq(userDetail.getQq());
+      if (null != userDetail.getGender()) {
+        bean.setGender(userDetail.getGender().getName());
+      }
+
+      if (null != address) {
+        bean.setCity(address.getCity());
+        bean.setDistrict(address.getDistrict());
+        bean.setAddress(address.getAddress());
+        bean.setProvince(address.getProvince());
+      }
+      if (null != extInfo) {
+        bean.setEducationEnum(extInfo.getEducationEnum());
+        bean.setOccupationEnum(extInfo.getOccupationEnum());
+        bean.setMarryStatus(extInfo.getMarryStatus());
+      }
+      if (org.apache.commons.collections.CollectionUtils.isNotEmpty(contacts)) {
+        List<XContact> userContacts = contacts2ContactRets(contacts);
+        bean.setContractResults(userContacts);
+      }
+    }
+
+    return JsonResult.buildSuccessResult("", bean);
+  }
+  @RequestMapping("/user-association/search/uid")
+  @LogHttpCaller
+  public JsonResult findUserAssociationByUid(Long uid) {
+    UserDetail userDetail = userDetailService.findByUserId(uid);
+    UserAssociationBean bean = new UserAssociationBean();
+
+    if (null != userDetail) {
+      Address address = addressService.findByUserId(userDetail.getUserId());
+      List<Contact> contacts = contactService.findByUserId(userDetail.getUserId());
+      UserExtInfo extInfo = userExtInfoService.findByUserId(userDetail.getUserId());
+      bean.setUserId(userDetail.getUserId());
+      bean.setPhoneNo(userDetail.getPhoneNo());
+      bean.setName(userDetail.getName());
+      bean.setIdNo(userDetail.getIdNo());
+      bean.setQq(userDetail.getQq());
+      if (null != userDetail.getGender()) {
+        bean.setGender(userDetail.getGender().getName());
+      }
+
+      if (null != address) {
+        bean.setCity(address.getCity());
+        bean.setDistrict(address.getDistrict());
+        bean.setAddress(address.getAddress());
+        bean.setProvince(address.getProvince());
+      }
+      if (null != extInfo) {
+        bean.setEducationEnum(extInfo.getEducationEnum());
+        bean.setOccupationEnum(extInfo.getOccupationEnum());
+        bean.setMarryStatus(extInfo.getMarryStatus());
+      }
+      if (org.apache.commons.collections.CollectionUtils.isNotEmpty(contacts)) {
+        List<XContact> userContacts = contacts2ContactRets(contacts);
+        bean.setContractResults(userContacts);
+      }
+    }
+
+    return JsonResult.buildSuccessResult("", bean);
+  }
+
   @RequestMapping("/user/save")
   public JsonResult saveUser(
       String phoneNo, Long registeredFrom, Long createdAt, Long updatedAt,
@@ -714,4 +795,28 @@ public class InnerController implements IBaseController {
     }
     return JsonResult.buildSuccessResult(null, new UserRet(user));
   }
+
+  public static XContact contact2ContactRet(Contact c) {
+    if (c == null) {
+      return null;
+    }
+    XContact ret = new XContact();
+    ret.setId(c.getId());
+    ret.setUserId(c.getUserId());
+    ret.setName(c.getName());
+    ret.setPhoneNo(c.getPhoneNo());
+    ret.setRelation(c.getRelation());
+    return ret;
+  }
+
+  public static List<XContact> contacts2ContactRets(List<Contact> cs) {
+    if (org.apache.commons.collections.CollectionUtils.isEmpty(cs)) {
+      return Collections.emptyList();
+    }
+    List<XContact> contactRets = new ArrayList<>();
+    for (Contact c : cs) {
+      contactRets.add(contact2ContactRet(c));
+    }
+    return contactRets;
+  }
 }
\ No newline at end of file