Commit 80203624 authored by xiaoguang.xu's avatar xiaoguang.xu

用户扩展信息保存、修改,更新属性名与文档一致。

parent e56afe11
...@@ -2,7 +2,9 @@ package cn.quantgroup.xyqb.controller.middleoffice.userext; ...@@ -2,7 +2,9 @@ package cn.quantgroup.xyqb.controller.middleoffice.userext;
import cn.quantgroup.xyqb.controller.middleoffice.userext.req.UserExtReq; import cn.quantgroup.xyqb.controller.middleoffice.userext.req.UserExtReq;
import cn.quantgroup.xyqb.entity.Address;
import cn.quantgroup.xyqb.entity.User; import cn.quantgroup.xyqb.entity.User;
import cn.quantgroup.xyqb.entity.UserExtInfo;
import cn.quantgroup.xyqb.model.JsonResult; import cn.quantgroup.xyqb.model.JsonResult;
import cn.quantgroup.xyqb.service.user.*; import cn.quantgroup.xyqb.service.user.*;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
...@@ -47,12 +49,21 @@ public class UserExtController { ...@@ -47,12 +49,21 @@ public class UserExtController {
contactService.save(userId, userExtReq.getContacts()); contactService.save(userId, userExtReq.getContacts());
} }
if (userExtReq.getAddress() != null) { if (userExtReq.getAddress() != null) {
Address address = addressService.findByUserId(userId);
if (address != null) {
userExtReq.getAddress().setId(address.getId());
}
userExtReq.getAddress().setUserId(userId); userExtReq.getAddress().setUserId(userId);
addressService.save(userExtReq.getAddress()); addressService.save(userExtReq.getAddress());
} }
if (userExtReq.getUserExtInfo() != null) { if (userExtReq.getExtInfo() != null) {
userExtReq.getUserExtInfo().setUserId(userId); UserExtInfo extInfo = userExtInfoService.findByUserId(userId);
userExtInfoService.save(userExtReq.getUserExtInfo()); if (extInfo != null) {
Long id = extInfo.getId();
userExtReq.getExtInfo().setId(id);
}
userExtReq.getExtInfo().setUserId(userId);
userExtInfoService.save(userExtReq.getExtInfo());
} }
return JsonResult.buildSuccessResult(); return JsonResult.buildSuccessResult();
} }
......
...@@ -11,7 +11,7 @@ import java.util.List; ...@@ -11,7 +11,7 @@ import java.util.List;
public class UserExtReq { public class UserExtReq {
private List<Contact> contacts; private List<Contact> contacts;
private Address address; private Address address;
private UserExtInfo userExtInfo; private UserExtInfo extInfo;
private String email; private String email;
private String qq; private String qq;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment