增加修改接口

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

@@ -3,6 +3,7 @@ package cn.quantgroup.xyqb.controller.external.user;
 import cn.quantgroup.xyqb.entity.User;
 import cn.quantgroup.xyqb.entity.UserDetail;
 import cn.quantgroup.xyqb.entity.UserExtInfo;
+import cn.quantgroup.xyqb.entity.enumerate.*;
 import cn.quantgroup.xyqb.model.*;
 import cn.quantgroup.xyqb.service.auth.IIdCardService;
 import cn.quantgroup.xyqb.service.user.IUserDetailService;
@@ -189,6 +190,49 @@ public class InnerController {
         return JsonResult.buildSuccessResult(null, null);
     }
 
+    @RequestMapping("/user_ext_info/update")
+    public JsonResult updateMarryStatus(
+            Long userId, IncomeEnum incomeEnum, IncomeRangeEnum incomeRangeEnum,
+            OccupationEnum occupationEnum, EducationEnum educationEnum, Boolean hasCar,
+            Boolean hasSocialSecurity, Boolean hasHouse, Boolean hasCreditCard, MaritalStatus maritalStatus) {
+        if (null == userId) {
+            return JsonResult.buildErrorStateResult("用户ID不能为空", null);
+        }
+        UserExtInfo info = userExtInfoService.findByUserId(userId);
+        if (info == null) {
+            Timestamp now = new Timestamp(System.currentTimeMillis());
+            info = new UserExtInfo();
+            info.setCreatedAt(now);
+            info.setUpdateAt(now);
+        }
+        if (incomeEnum != null) {
+            info.setIncomeEnum(incomeEnum);
+        }
+        if (incomeRangeEnum != null) {
+            info.setIncomeRangeEnum(incomeRangeEnum);
+        }
+        if (occupationEnum != null) {
+            info.setOccupationEnum(occupationEnum);
+        }
+        if (educationEnum != null) {
+            info.setEducationEnum(educationEnum);
+        }
+        if (hasCar != null) {
+            info.setHasCar(hasCar);
+        }
+        if (hasSocialSecurity != null) {
+            info.setHasCreditCard(hasCreditCard);
+        }
+        if (hasHouse != null) {
+            info.setHasHouse(hasHouse);
+        }
+        if (maritalStatus != null) {
+            info.setMarryStatus(maritalStatus);
+        }
+        info = userExtInfoService.save(info);
+        return JsonResult.buildSuccessResult(null, info);
+    }
+
     @RequestMapping("/user_detail/search_list")
     public JsonResult searchUserDetailList(String name, String phoneNo, String idNo) {
         List<UserDetail> userDetails = userDetailService.searchUserDetailList(name, phoneNo, idNo);

src/main/java/cn/quantgroup/xyqb/entity/UserExtInfo.java

@@ -25,23 +25,23 @@ public class UserExtInfo implements Serializable {
     @Column(name = "user_id")
     private Long userId;
     @Column(name = "means_of_income_payment")
-    private IncomeEnum incomeEnum;
+    private IncomeEnum incomeEnum = IncomeEnum.UNKNOWN;
     @Column(name = "monthly_income_range")
-    private IncomeRangeEnum incomeRangeEnum;
+    private IncomeRangeEnum incomeRangeEnum = IncomeRangeEnum.UNKNOWN;
     @Column(name = "occupation")
-    private OccupationEnum occupationEnum;
+    private OccupationEnum occupationEnum = OccupationEnum.UNKNOWN;
     @Column(name = "education")
-    private EducationEnum educationEnum;
+    private EducationEnum educationEnum = EducationEnum.UNKNOWN;
     @Column(name = "has_car")
-    private boolean hasCar;
+    private boolean hasCar = false;
     @Column(name = "has_social_security")
-    private boolean hasSocialSecurity;
+    private boolean hasSocialSecurity = false;
     @Column(name = "has_house")
-    private boolean hasHouse;
+    private boolean hasHouse = false;
     @Column(name = "has_credit_card")
-    private boolean hasCreditCard;
+    private boolean hasCreditCard = false;
     @Column(name = "marry_status")
-    private MaritalStatus marryStatus;
+    private MaritalStatus marryStatus = MaritalStatus.UNKNOWN;
     @Column(name = "created_at")
     private Timestamp createdAt;
     @Column(name = "updated_at")

src/main/java/cn/quantgroup/xyqb/service/user/IUserExtInfoService.java

@@ -8,4 +8,6 @@ import cn.quantgroup.xyqb.entity.UserExtInfo;
 public interface IUserExtInfoService {
 
     UserExtInfo findByUserId(Long userId);
+
+    UserExtInfo save(UserExtInfo info);
 }

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

@@ -4,8 +4,10 @@ import cn.quantgroup.xyqb.entity.UserExtInfo;
 import cn.quantgroup.xyqb.repository.IUserExtInfoRepository;
 import cn.quantgroup.xyqb.service.user.IUserExtInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * Created by Miraculous on 2017/1/3.
@@ -22,4 +24,11 @@ public class UserExtInfoServiceImpl implements IUserExtInfoService {
         return userExtInfoRepository.findByUserId(userId);
     }
 
+    @Override
+    @Transactional
+    @CacheEvict(value = "userextinfocache", key = "'extinfo' + #info.userId", cacheManager = "cacheManager")
+    public UserExtInfo save(UserExtInfo info) {
+        return userExtInfoRepository.save(info);
+    }
+
 }