账户 同步接口bug

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

@@ -16,7 +16,9 @@ import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 @Service("v2.EnterpriseService")
 public class EnterpriseServiceImpl implements EnterpriseService {
@@ -49,11 +51,24 @@ public class EnterpriseServiceImpl implements EnterpriseService {
         enterprise.setEnName(userSpaceDetail.getName());
         enterprise.setEnLogoUrl(userSpaceDetail.getBusinessCodeImage());
         enterprise.setUu(Long.valueOf(userSpace.getDialectUID()));
-        enterpriseDao.save(enterprise);
+        User adminUser = userDao.findUserByUserTel(userSpaceDetail.getAdminTel()).get(0);
+        Enterprise newEn = enterpriseDao.save(enterprise);
+        if (null != adminUser){
+            Set<Enterprise> enterprises = null;
+            if (null == adminUser.getEnterprises()){
+                enterprises = new HashSet<Enterprise>();
+            }else{
+                enterprises = adminUser.getEnterprises();
+            }
+            enterprises.add(newEn);
+            adminUser.setEnterprises(enterprises);
+            enterprise.setEnAdminuu(adminUser.getUserUU());
+            userDao.save(adminUser);
+        }
         if(null != oldenterprise) {
-            logger.log("更新企业信息", enterprise.getUu()+"time: " + sdf.format(new Date()), enterprise.getUu(), 0L);
+            logger.log("更新企业信息", enterprise.getUu()+"time: " + sdf.format(new Date()));
         } else {
-            logger.log("新增企业信息", enterprise.getUu()+"time: " + sdf.format(new Date()), enterprise.getUu(), 0L);
+            logger.log("新增企业信息", enterprise.getUu()+"time: " + sdf.format(new Date()));
         }
     }
 

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

@@ -12,8 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 
 @Service("v2.UserService")
@@ -37,13 +36,35 @@ public class UserServiceImpl implements UserService {
         }
         u.setUserPwd(user.getPassword());
         u.setUserName(user.getName());
+        u.setUserTel(user.getUid());
         u.setEnable((short) 1);
         u.setUserEmail(user.getSecondUID());
         u.setUserUU(Long.valueOf(user.getDialectUID()));
         Enterprise enterprise = enterpriseDao.findByUu(Long.valueOf(user.getSpaceDialectUID()));
-        if(null != enterprise) {
-            u.setEnterprise(enterprise);
+
+        //将该成员添加至企业
+        Set<Enterprise> ens = u.getEnterprises();
+        Iterator<Enterprise> it = ens.iterator();
+        boolean isMember = false;
+        while (it.hasNext()){
+            if (it.next().getUu() == enterprise.getUu()){
+                isMember = true;
+            }
+        }
+        if (!isMember){
+            Set<Enterprise> enterprises = null;
+            if (null == u.getEnterprises()){
+                enterprises = new HashSet<Enterprise>();
+            }else{
+                enterprises = u.getEnterprises();
+            }
+            if(null != enterprise) {
+                u.setEnterprise(enterprise);
+                enterprises.add(enterprise);
+            }
+            u.setEnterprises(enterprises);
         }
+
         List<com.uas.platform.b2c.common.account.model.User> oldUsers = userDao.findUserByUserUU(u.getUserUU());
         userDao.save(u);
         if(oldUsers.size() > 0) {