允许修改用户经济和联系人信息以及地址

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

@@ -241,19 +241,29 @@ public class UserCenterController {
             return JsonResult.buildErrorStateResult(null, null);
         }
         List<Contact> userContact = contactService.findByUserId(userId);
-        if(userContact != null && userContact.size() >= 2) {
+        /*if(userContact != null && userContact.size() >= 2) {
             return JsonResult.buildSuccessResult(null, ContactRet.contacts2ContactRets(userContact));
-        }
+        }*/
+        //推翻之前逻辑,联系人可以更改.如果数据库已有记录.则更改
         List<Contact> contacts = JSONObject.parseObject(contactJson, new TypeReference<List<Contact>>() {});
+        Timestamp now = new Timestamp(System.currentTimeMillis());
         if (CollectionUtils.isEmpty(contacts)) {
             return JsonResult.buildErrorStateResult(null, null);
         }
-        Timestamp now = new Timestamp(System.currentTimeMillis());
-        for (Contact c : contacts) {
-            c.setId(null);
-            c.setUserId(userId);
-            c.setCreatedAt(now);
-            c.setUpdateAt(now);
+        if(null != userContact && userContact.size() > 0) {
+            for(int i = 0; i < contacts.size(); i ++) {
+                contacts.get(i).setId(userContact.get(i).getId());
+                contacts.get(i).setUserId(userContact.get(i).getUserId());
+                contacts.get(i).setCreatedAt(now);
+                contacts.get(i).setUpdateAt(now);
+            }
+        } else {
+            for (Contact c : contacts) {
+                c.setId(null);
+                c.setUserId(userId);
+                c.setCreatedAt(now);
+                c.setUpdateAt(now);
+            }
         }
         List<Contact> result = contactService.save(contacts);
         return JsonResult.buildSuccessResult(null, result);
@@ -366,18 +376,17 @@ public class UserCenterController {
         }
         //查询用户是否保存过.
         UserExtInfo userExtInfo = userExtInfoService.findByUserId(userId);
-        if(null != userExtInfo) {
-            return JsonResult.buildErrorStateResult("暂不可修改", null, 6001L);
-        }
-        userExtInfo = new UserExtInfo();
         Timestamp now = new Timestamp(System.currentTimeMillis());
-        userExtInfo.setUserId(userId);
+        if(null == userExtInfo) {
+            userExtInfo = new UserExtInfo();
+        }
         userExtInfo.setCreatedAt(now);
         userExtInfo.setUpdateAt(now);
         userExtInfo.setEducationEnum(educationEnum);
         userExtInfo.setMarryStatus(maritalStatus);
         userExtInfo.setOccupationEnum(occupationEnum);
         userExtInfo.setIncomeRangeEnum(incomeRangeEnum);
+
         userExtInfo = userExtInfoService.save(userExtInfo);
         return JsonResult.buildSuccessResult(null, userExtInfo);
     }