修复 账户同步问题2

src/main/java/com/uas/platform/b2c/common/account/v2/service/impl/UserServiceImpl.java

@@ -11,6 +11,7 @@ import com.uas.platform.core.model.Status;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
 
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -31,20 +32,38 @@ public class UserServiceImpl implements UserService {
 
     @Override
     public void save(User user) {
-        if (null == user.getDialectUID() || "".equals(user.getDialectUID())){
+        com.uas.platform.b2c.common.account.model.User u = null;
+        if (!StringUtils.isEmpty(user.getDialectUID())) {
+            u = userDao.findOne(Long.parseLong(user.getDialectUID()));
+        }
+        if (u == null && !StringUtils.isEmpty(user.getUid()) ){
             List<com.uas.platform.b2c.common.account.model.User> users = userDao.findUserByUserTel(user.getUid());
             if (!CollectionUtils.isEmpty(users)){
-                for (com.uas.platform.b2c.common.account.model.User u:users){
-                    oneSave(user,u);
+                u = users.get(0);
+                if (users.size() > 1) {
+                    userDao.delete(users);
                 }
-            }
-        }else {
-            com.uas.platform.b2c.common.account.model.User u = userDao.findOne(Long.parseLong(user.getDialectUID()));
-            if (null == u) {
-                u = new com.uas.platform.b2c.common.account.model.User();
                 oneSave(user,u);
             }
         }
+        if (null == u) {
+            u = new com.uas.platform.b2c.common.account.model.User();
+            oneSave(user,u);
+        }
+//        if (null == user.getDialectUID() || "".equals(user.getDialectUID())){
+//            List<com.uas.platform.b2c.common.account.model.User> users = userDao.findUserByUserTel(user.getUid());
+//            if (!CollectionUtils.isEmpty(users)){
+//                for (com.uas.platform.b2c.common.account.model.User u:users){
+//                    oneSave(user,u);
+//                }
+//            }
+//        }else {
+//            com.uas.platform.b2c.common.account.model.User u = userDao.findOne(Long.parseLong(user.getDialectUID()));
+//            if (null == u) {
+//                u = new com.uas.platform.b2c.common.account.model.User();
+//                oneSave(user,u);
+//            }
+//        }
 
     }
     private void oneSave(User user , com.uas.platform.b2c.common.account.model.User u){

src/main/resources/test/account.properties

@@ -9,7 +9,7 @@ sso.secretkey=0taQcW073Z7G628g5H
 sso.cookie.secure=false
 sso.login.url=http://113.105.74.135:8001/sso/login
 sso.logout.url=http://113.105.74.135:8001/sso/logout
-sso.register.url=http://113.105.74.135:8001/sso/register
+sso.register.url=http://113.105.74.135:8001/sso/register_p
 
 #cross domain
 sso.ask.url=http://113.105.74.135:8001/sso/login/ask