友宝测试更新

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

 package cn.quantgroup.xyqb.controller.external.user;
 
-import cn.quantgroup.xyqb.Constants;
+import cn.quantgroup.user.enums.*;
 import cn.quantgroup.xyqb.aspect.logcaller.LogHttpCaller;
 import cn.quantgroup.xyqb.controller.IBaseController;
-import cn.quantgroup.xyqb.entity.Address;
-import cn.quantgroup.xyqb.entity.Contact;
-import cn.quantgroup.xyqb.entity.User;
-import cn.quantgroup.xyqb.entity.UserDetail;
-import cn.quantgroup.xyqb.entity.UserExtInfo;
-import cn.quantgroup.xyqb.entity.UserSpouse;
-import cn.quantgroup.xyqb.entity.WechatUserInfo;
+import cn.quantgroup.xyqb.entity.*;
+import cn.quantgroup.xyqb.entity.enumerate.*;
 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.MaritalStatus;
 import cn.quantgroup.xyqb.entity.enumerate.OccupationEnum;
 import cn.quantgroup.xyqb.entity.enumerate.Relation;
-import cn.quantgroup.xyqb.model.AddressRet;
-import cn.quantgroup.xyqb.model.ContactRet;
-import cn.quantgroup.xyqb.model.IdType;
-import cn.quantgroup.xyqb.model.JsonResult;
-import cn.quantgroup.xyqb.model.UserDetailRet;
-import cn.quantgroup.xyqb.model.UserExtInfoRet;
-import cn.quantgroup.xyqb.model.UserRet;
-import cn.quantgroup.xyqb.model.UserSpouseRet;
-import cn.quantgroup.xyqb.entity.*;
-import cn.quantgroup.user.enums.*;
 import cn.quantgroup.xyqb.model.*;
 import cn.quantgroup.xyqb.model.IdType;
 import cn.quantgroup.xyqb.service.auth.IIdCardService;
 import cn.quantgroup.xyqb.service.http.IHttpService;
 import cn.quantgroup.xyqb.service.session.ISessionService;
-import cn.quantgroup.xyqb.service.user.IAddressService;
-import cn.quantgroup.xyqb.service.user.IContactService;
-import cn.quantgroup.xyqb.service.user.IUserDetailService;
-import cn.quantgroup.xyqb.service.user.IUserExtInfoService;
-import cn.quantgroup.xyqb.service.user.IUserService;
-import cn.quantgroup.xyqb.service.user.IUserSpouseService;
+import cn.quantgroup.xyqb.service.user.*;
 import cn.quantgroup.xyqb.service.wechat.IWechatService;
-import cn.quantgroup.xyqb.util.PasswordUtil;
 import cn.quantgroup.xyqb.util.ValidationUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
@@ -46,17 +25,10 @@ import com.alibaba.fastjson.TypeReference;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
-import com.google.common.collect.ImmutableMap;
-import java.sql.Timestamp;
-import java.text.ParseException;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 import com.google.common.base.MoreObjects;
+import com.google.common.collect.ImmutableMap;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.math.NumberUtils;
-import org.joda.time.DateTime;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -72,7 +44,6 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
-import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.stream.Collectors;
 
 /**
@@ -347,7 +318,7 @@ public class InnerController implements IBaseController {
     for (Contact c : contacts) {
       c.setId(null);
       c.setUserId(userId);
-      c.setRelation(c.getRelation() == null ? Relation.OTHER : c.getRelation());
+      c.setRelation(c.getRelation() == null ? cn.quantgroup.user.enums.Relation.OTHER: c.getRelation());
       c.setCreatedAt(now);
       c.setUpdateAt(now);
     }
@@ -412,16 +383,16 @@ public class InnerController implements IBaseController {
     }
     info.setUpdateAt(now);
     if (incomeEnum != null) {
-      info.setIncomeEnum(incomeEnum);
+      info.setIncomeEnum(cn.quantgroup.user.enums.IncomeEnum.valueOf(incomeEnum.name()));
     }
     if (incomeRangeEnum != null) {
-      info.setIncomeRangeEnum(incomeRangeEnum);
+      info.setIncomeRangeEnum(cn.quantgroup.user.enums.IncomeRangeEnum.valueOf(incomeRangeEnum.name()));
     }
     if (occupationEnum != null) {
-      info.setOccupationEnum(occupationEnum);
+      info.setOccupationEnum(cn.quantgroup.user.enums.OccupationEnum.valueOf(occupationEnum.name()));
     }
     if (educationEnum != null) {
-      info.setEducationEnum(educationEnum);
+      info.setEducationEnum(cn.quantgroup.user.enums.EducationEnum.valueOf(educationEnum.name()));
     }
     if (hasCar != null) {
       info.setHasCar(hasCar);
@@ -433,7 +404,7 @@ public class InnerController implements IBaseController {
       info.setHasHouse(hasHouse);
     }
     if (maritalStatus != null) {
-      info.setMarryStatus(maritalStatus);
+      info.setMarryStatus(cn.quantgroup.user.enums.MaritalStatus.valueOf(maritalStatus.name()));
     }
     info = userExtInfoService.save(info);
     return JsonResult.buildSuccessResult(null, UserExtInfoRet.getUserExtInfoRet(info));
@@ -546,7 +517,7 @@ public class InnerController implements IBaseController {
     }
     userSpouse.setSpouseName(status == MaritalStatus.MARRIED ? spouseName : "");
     userSpouse.setSpousePhone(status == MaritalStatus.MARRIED ? spousePhone : "");
-    userSpouse.setStatus(status);
+    userSpouse.setStatus(cn.quantgroup.user.enums.MaritalStatus.valueOf(status.name()));
     userSpouse.setUpdateAt(timestamp);
     userSpouse = userSpouseService.save(userSpouse);
     return JsonResult.buildSuccessResult(null, UserSpouseRet.getUserSpouseRet(userSpouse));
@@ -561,7 +532,7 @@ public class InnerController implements IBaseController {
     UserSpouse userSpouse = userSpouseService.findByUserId(userId);
     if (userSpouse == null) {
       userSpouse = new UserSpouse(userId);
-      userSpouse.setStatus(MaritalStatus.UNKNOWN);
+      userSpouse.setStatus(cn.quantgroup.user.enums.MaritalStatus.UNKNOWN);
     }
     return JsonResult.buildSuccessResult(null, UserSpouseRet.getUserSpouseRet(userSpouse));
   }

src/main/java/cn/quantgroup/xyqb/controller/external/user/center/UserCenterController.java

@@ -2,13 +2,10 @@ package cn.quantgroup.xyqb.controller.external.user.center;
 
 import cn.quantgroup.xyqb.Constants;
 import cn.quantgroup.xyqb.entity.*;
-import cn.quantgroup.xyqb.entity.enumerate.EducationEnum;
-import cn.quantgroup.xyqb.entity.enumerate.IncomeRangeEnum;
-import cn.quantgroup.xyqb.entity.enumerate.MaritalStatus;
-import cn.quantgroup.xyqb.entity.enumerate.OccupationEnum;
 import cn.quantgroup.xyqb.model.ContactRet;
 import cn.quantgroup.xyqb.model.JsonResult;
 import cn.quantgroup.xyqb.service.user.*;
+import cn.quantgroup.user.enums.*;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
 import org.apache.commons.collections.CollectionUtils;