给用户添加婚姻状态

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

@@ -374,25 +374,27 @@ public class InnerController {
   }
 
   @RequestMapping("/user/spouse/save")
-  public JsonResult saveSpouse(Long userId, String spousePhone, String spouseName) {
+  public JsonResult saveSpouse(Long userId, MaritalStatus status, String spousePhone, String spouseName) {
     if (userId == null || userId == 0) {
       return JsonResult.buildErrorStateResult("用户不能为空", null);
     }
-    if (!ValidationUtil.validatePhoneNo(spousePhone)) {
-      return JsonResult.buildErrorStateResult("手机号格式错误", null);
-    }
-    if (StringUtils.isBlank(spouseName)) {
-      return JsonResult.buildErrorStateResult("配偶姓名不能为空", null);
+    if (status == MaritalStatus.MARRIED) {
+      if (!ValidationUtil.validatePhoneNo(spousePhone)) {
+        return JsonResult.buildErrorStateResult("手机号格式错误", null);
+      }
+      if (StringUtils.isBlank(spouseName)) {
+        return JsonResult.buildErrorStateResult("配偶姓名不能为空", null);
+      }
     }
     UserSpouse userSpouse = userSpouseService.findByUserId(userId);
     Timestamp timestamp = new Timestamp(System.currentTimeMillis());
     if (userSpouse == null) {
-      userSpouse = new UserSpouse();
+      userSpouse = new UserSpouse(userId);
+      userSpouse.setCreatedAt(timestamp);
     }
-    userSpouse.setSpouseName(spouseName);
-    userSpouse.setSpousePhone(spousePhone);
-    userSpouse.setUserId(userId);
-    userSpouse.setCreatedAt(timestamp);
+    userSpouse.setSpouseName(status == MaritalStatus.MARRIED ? spouseName : "");
+    userSpouse.setSpousePhone(status == MaritalStatus.MARRIED ? spousePhone : "");
+    userSpouse.setStatus(status);
     userSpouse.setUpdateAt(timestamp);
     userSpouse = userSpouseService.save(userSpouse);
     return JsonResult.buildSuccessResult(null, UserSpouseRet.getUserSpouseRet(userSpouse));
@@ -404,6 +406,10 @@ public class InnerController {
       return JsonResult.buildErrorStateResult("用户不能为空", null);
     }
     UserSpouse userSpouse = userSpouseService.findByUserId(userId);
+    if (userSpouse == null) {
+      userSpouse = new UserSpouse(userId);
+      userSpouse.setStatus(MaritalStatus.UNKNOWN);
+    }
     return JsonResult.buildSuccessResult(null, UserSpouseRet.getUserSpouseRet(userSpouse));
   }
 

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

 package cn.quantgroup.xyqb.entity;
 
 
-import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
+import cn.quantgroup.xyqb.entity.enumerate.MaritalStatus;
+import lombok.*;
 
 import javax.persistence.*;
 import java.io.Serializable;
@@ -16,6 +14,7 @@ import java.sql.Timestamp;
 @Getter
 @Setter
 @ToString
+@NoArgsConstructor
 public class UserSpouse implements Serializable {
   private static final long serialVersionUID = -1L;
 
@@ -38,4 +37,11 @@ public class UserSpouse implements Serializable {
 
   @Column(name = "updated_at")
   private Timestamp updateAt;
+
+  @Column(name = "status")
+  private MaritalStatus status;
+
+  public UserSpouse(Long userId) {
+    this.userId = userId;
+  }
 }

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

 package cn.quantgroup.xyqb.model;
 
-import cn.quantgroup.xyqb.entity.UserExtInfo;
 import cn.quantgroup.xyqb.entity.UserSpouse;
+import cn.quantgroup.xyqb.entity.enumerate.MaritalStatus;
 import lombok.Data;
 
-import javax.persistence.Column;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import java.sql.Timestamp;
-
 /**
  * Created by 11 on 2017/4/19.
  */
 @Data
 public class UserSpouseRet {
-    private Long id;
 
-    private Long userId;
+  private Long userId;
+
+  private String spousePhone;
 
-    private String spousePhone;
+  private String spouseName;
 
-    private String spouseName;
+  private Long createdAt;
 
-    private Long createdAt;
+  private Long updateAt;
 
-    private Long updateAt;
+  private MaritalStatus status;
 
-    public static UserSpouseRet getUserSpouseRet(UserSpouse userSpouse) {
-        if (userSpouse == null) {
-            return null;
-        }
-        UserSpouseRet ret = new UserSpouseRet();
-        ret.setUserId(userSpouse.getUserId());
-        ret.setSpouseName(userSpouse.getSpouseName());
-        ret.setSpousePhone(userSpouse.getSpousePhone());
-        ret.setUpdateAt(userSpouse.getUpdateAt().getTime());
-        ret.setCreatedAt(userSpouse.getCreatedAt().getTime());
-        ret.setId(userSpouse.getId());
-        ret.setId(userSpouse.getId());
-        return ret;
+  public static UserSpouseRet getUserSpouseRet(UserSpouse userSpouse) {
+    if (userSpouse == null) {
+      return null;
+    }
+    UserSpouseRet ret = new UserSpouseRet();
+    ret.setUserId(userSpouse.getUserId());
+    ret.setSpouseName(userSpouse.getSpouseName());
+    ret.setSpousePhone(userSpouse.getSpousePhone());
+    if (userSpouse.getUpdateAt() != null) {
+      ret.setUpdateAt(userSpouse.getUpdateAt().getTime());
+    }
+    if (userSpouse.getCreatedAt() != null) {
+      ret.setCreatedAt(userSpouse.getCreatedAt().getTime());
     }
+    ret.setStatus(userSpouse.getStatus());
+    return ret;
+  }
 }