修改保存扩展信息接口

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

@@ -375,16 +375,25 @@ public class UserCenterController {
             userExtInfo = new UserExtInfo();
             userExtInfo.setUserId(userId);
         }
-        userExtInfo.setEducationEnum(educationEnum);
-        userExtInfo.setMarryStatus(maritalStatus);
+        if(null != educationEnum){
+            userExtInfo.setEducationEnum(educationEnum);
+
+        }
+        if(null != maritalStatus){
+            userExtInfo.setMarryStatus(maritalStatus);
+        }
         //如果是学生那么转成其他
         if (null != occupationEnum) {
             if (OccupationEnum.STUDENT == occupationEnum) {
                 occupationEnum = OccupationEnum.OTHER;
             }
         }
-        userExtInfo.setOccupationEnum(occupationEnum);
-        userExtInfo.setIncomeRangeEnum(incomeRangeEnum);
+        if(null !=occupationEnum){
+            userExtInfo.setOccupationEnum(occupationEnum);
+
+        }if(null !=incomeRangeEnum){
+            userExtInfo.setIncomeRangeEnum(incomeRangeEnum);
+        }
 
         userExtInfo = userExtInfoService.save(userExtInfo);
         return JsonResult.buildSuccessResult(null, userExtInfo);

src/main/java/cn/quantgroup/xyqb/service/user/impl/UserServiceImpl.java

 package cn.quantgroup.xyqb.service.user.impl;
 
 import cn.quantgroup.user.enums.BizType;
+import cn.quantgroup.user.enums.IncomeRangeEnum;
 import cn.quantgroup.xyqb.Constants;
 import cn.quantgroup.xyqb.aspect.lock.RedisLock;
 import cn.quantgroup.xyqb.controller.IBaseController;
@@ -404,7 +405,9 @@ public class UserServiceImpl implements IUserService, IBaseController {
         }
         if (userExtInfo != null) {
             userFullResp.setIncomeType(userExtInfo.getIncomeEnum().ordinal());
-            userFullResp.setIncomeRange(userExtInfo.getIncomeRangeEnum().ordinal());
+            userFullResp.setIncomeRange(userExtInfo.getIncomeRangeEnum()== null?
+                    IncomeRangeEnum.UNKNOWN.ordinal():
+                    userExtInfo.getIncomeRangeEnum().ordinal());
             userFullResp.setOccupation(userExtInfo.getOccupationEnum().ordinal());
             userFullResp.setEducation(userExtInfo.getEducationEnum().ordinal());
             userFullResp.setHasCar(userExtInfo.getHasCar() == null ? 0 : userExtInfo.getHasCar() ? 1 : 0);