补充注册渠道主键以及二级商户主键

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

@@ -56,6 +56,8 @@ public class InnerController implements IBaseController {
   @Autowired
   private IUserDetailService userDetailService;
   @Autowired
+  private IUserBtRegisterService userBtRegisterService;
+  @Autowired
   private IIdCardService idCardService;
   @Autowired
   private IUserExtInfoService userExtInfoService;
@@ -596,17 +598,29 @@ public class InnerController implements IBaseController {
   @RequestMapping("/user-association/search/userId")
   @LogHttpCaller
   public JsonResult findUserAssociationModelByUserId(Long userId) {
-    UserDetail userDetail = userDetailService.findByUserId(userId);
+    if(Objects.isNull(userId) || userId < 0){
+      return JsonResult.buildErrorStateResult("", "");
+    }
     UserAssociationModel bean = new UserAssociationModel();
-    if (null != userDetail) {
-      UserExtInfo extInfo = userExtInfoService.findByUserId(userDetail.getUserId());
+    UserDetail userDetail = userDetailService.findByUserId(userId);
+    if (!Objects.isNull(userDetail)) {
       bean.setId(userDetail.getUserId());
       bean.setPhoneNo(userDetail.getPhoneNo());
       bean.setName(userDetail.getName());
       bean.setIdNo(userDetail.getIdNo());
       bean.setQq(userDetail.getQq());
       bean.setGender(Optional.ofNullable(userDetail.getGender()).orElse(cn.quantgroup.xyqb.model.Gender.UNKNOWN).getName());
-      if (null != extInfo) {
+    }
+    User user = userService.findById(userId);
+    if (!Objects.isNull(user)) {
+      bean.setRegisterFrom(user.getRegisteredFrom());
+    }
+    UserBtRegister userBtRegister = userBtRegisterService.findByUserId(userId);
+    if (!Objects.isNull(userBtRegister)) {
+      bean.setMerchantId(userBtRegister.getRegisterBtMerchantId());
+    }
+    UserExtInfo extInfo = userExtInfoService.findByUserId(userDetail.getUserId());
+    if (!Objects.isNull(extInfo)) {
       if(null==extInfo.getEducationEnum()){
         bean.setEducationEnum(cn.quantgroup.user.enums.EducationEnum.UNKNOWN.getName());
       }else{
@@ -624,8 +638,11 @@ public class InnerController implements IBaseController {
       }
     }
     Address address = addressService.findByUserId(userDetail.getUserId());
-      List<Contact> contacts = contactService.findByUserId(userDetail.getUserId(), true);
+    if (!Objects.isNull(address)) {
       bean.putAddressList(Arrays.asList(address));
+    }
+    List<Contact> contacts = contactService.findByUserId(userDetail.getUserId(), true);
+    if (!Objects.isNull(address)) {
       bean.putContractList(contacts);
     }
     return JsonResult.buildSuccessResult("", bean);

src/main/java/cn/quantgroup/xyqb/model/UserAssociationModel.java

@@ -27,9 +27,15 @@ public class UserAssociationModel implements Serializable {
     private String educationEnum;
     private String occupationEnum;
     private String qq;
+    private Long registerFrom;
+    private Long merchantId;
     private List<AddressModel> addressList;
     private List<ContactModel> contractList;
 
+    /**
+    * 填充地址模型列表
+    * @param entitylist
+    */
     public void putAddressList(List<Address> entitylist){
         if(Objects.isNull(entitylist)){
             return;
@@ -42,6 +48,10 @@ public class UserAssociationModel implements Serializable {
         }
     }
 
+    /**
+    * 填充联系人模型列表
+    * @param entitylist
+    */
     public void putContractList(List<Contact> entitylist){
         if(Objects.isNull(entitylist)){
             return;