Merge branch 'master' of http://gitabc.xyqb.com/head_group/xyqb-user2

# Conflicts:
#	src/main/java/cn/quantgroup/xyqb/controller/external/user/InnerController.java
#	src/main/java/cn/quantgroup/xyqb/service/user/IAddressService.java
#	src/main/java/cn/quantgroup/xyqb/service/user/impl/AddressServiceImpl.java

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

@@ -200,7 +200,10 @@ public class InnerController {
             return JsonResult.buildErrorStateResult(null, null);
         }
         List<Contact> contacts = contactService.findByUserId(userId);
-        return JsonResult.buildErrorStateResult(null, ContactRet.contacts2ContactRets(contacts));
+        if(null == contacts || contacts.size() == 0) {
+            return JsonResult.buildErrorStateResult(null, null);
+        }
+        return JsonResult.buildSuccessResult(null, ContactRet.contacts2ContactRets(contacts));
     }
 
     @RequestMapping("/contact/save/contacts")
@@ -277,6 +280,7 @@ public class InnerController {
         if (info == null) {
             Timestamp now = new Timestamp(System.currentTimeMillis());
             info = new UserExtInfo();
+            info.setUserId(userId);
             info.setCreatedAt(now);
             info.setUpdateAt(now);
         }

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

@@ -3,10 +3,7 @@ package cn.quantgroup.xyqb.entity;
 import cn.quantgroup.xyqb.entity.enumerate.*;
 import lombok.Data;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import javax.persistence.*;
 import java.io.Serializable;
 import java.sql.Timestamp;
 
@@ -20,6 +17,7 @@ public class UserExtInfo implements Serializable {
 
     private static final long serialVersionUID = -1L;
     @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "id")
     private Long id;
     @Column(name = "user_id")

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

@@ -10,4 +10,5 @@ public interface IAddressService {
     Address findByUserId(Long userId);
 
     Address save(Address addressObj);
+    Address saveAddress(Address address);
 }

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

 package cn.quantgroup.xyqb.service.user.impl;
 
 import cn.quantgroup.xyqb.entity.Address;
-import cn.quantgroup.xyqb.entity.UserExtInfo;
 import cn.quantgroup.xyqb.repository.IAddressRepository;
-import cn.quantgroup.xyqb.repository.IUserExtInfoRepository;
 import cn.quantgroup.xyqb.service.user.IAddressService;
-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;
@@ -33,4 +30,8 @@ public class AddressServiceImpl implements IAddressService {
     }
 
 
+    @Override
+    public Address saveAddress(Address address) {
+        return addressRepository.save(address);
+    }
 }