修改开店流程对接

src/main/java/com/uas/platform/b2c/common/account/controller/EnterpriseController.java

@@ -110,7 +110,7 @@ public class EnterpriseController {
 	 */
 	@RequestMapping(value = "/register", method = RequestMethod.POST)
 	public ResultMap registerEnterprise(@RequestBody FormEnterprise enterprise, String filePath) {
-		return enterpriseService.registerEnterprise(enterprise,filePath,SystemSession.getUser());
+		return enterpriseService.registerEnterprise(enterprise, filePath, SystemSession.getUser());
 	}
 
 	/**

src/main/java/com/uas/platform/b2c/common/account/dao/UserCacheEnterpriseDao.java

@@ -10,4 +10,5 @@ import org.springframework.stereotype.Repository;
  */
 @Repository
 public interface UserCacheEnterpriseDao extends JpaSpecificationExecutor<UserCacheEnterprise>, JpaRepository<UserCacheEnterprise, Long> {
+
 }

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

@@ -30,10 +30,7 @@ import org.springframework.ui.ModelMap;
 import org.springframework.util.StringUtils;
 
 import java.lang.reflect.Array;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Service
 public class EnterpriseServiceImpl implements EnterpriseService{
@@ -178,12 +175,12 @@ public class EnterpriseServiceImpl implements EnterpriseService{
 		detail.setBusinessCodeImage(enterprise.getUrl());
 		detail.setRegAddress(enterprise.getAddress());
 		detail.setLogoImage(enterprise.getLogoUrl());
-		detail.setTelephone(enterprise.getPhone());
+		detail.setTelephone(user.getUserTel());
 		detail.setProfession(enterprise.getProfession());
-		if (null == detail.getSpaceName() || null == detail.getBusinessCode() || null == detail.getBusinessCodeImage()) {
+		if (null == detail.getSpaceName() || null == detail.getBusinessCode() || null == detail.getRegAddress()) {
 			return new ResultMap(CodeType.SYSTEM_NOT_EXIST, "参数不能为空");
 		}
-		if (null != enterprise.getTagsData() || enterprise.getTagsData().length > 0) {
+		if (null != enterprise.getTagsData() && enterprise.getTagsData().length > 0) {
 			String str = Arrays.toString(enterprise.getTagsData());
 			str = str.substring(1, str.length() - 1);
 			detail.setTags(str);
@@ -191,23 +188,19 @@ public class EnterpriseServiceImpl implements EnterpriseService{
 			detail.setTags(null);
 		}
 
-		UserSpaceView userSpaceView = null;
 		try {
 			JSONObject data = JSON.parseObject(JSON.toJSONString(detail));
 			String userSpa = data.toJSONString();
-			userSpaceView = AccountUtils.register(detail, userView);
+			// 调用账户中心的接口注册企业
+			detail = AccountUtils.register(detail, userView);
 		} catch (Exception e) {
 			return new ResultMap(CodeType.SYSTEM_ERROR, e.getMessage());
 		}
-	/*	if (result.contains("errMsg") || !result.contains("enuu")) {
-			return new ResultMap(CodeType.SYSTEM_ERROR, "注册失败");
-		}*/
-		ModelMap data = new ModelMap("success", true);
 
-	/*	UserSpaceDetail userSpaceDetail = new UserSpaceDetail();
-		userSpaceDetail.set*/
-		data.put("enuu", userSpaceView.getSpaceUU());
-		return ResultMap.success(data);
+		// 将新注册的企业UU号返回
+		Map<String, Object> result = new HashMap<String, Object>();
+		result.put("enuu", detail.getSpaceUU());
+		return ResultMap.success(result);
 	}
 
 	@Override

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

@@ -391,7 +391,7 @@ public class UserServiceImpl implements UserService {
 
 	@Override
 	public void deleteUserCacheEnterprise(User user) {
-		userCacheEnterpriseDao.delete(userCacheEnterpriseDao.findOne(user.getUserUU()));
+		userCacheEnterpriseDao.delete(user.getUserUU());
         userCacheEnterpriseDao.flush();
 	}
 	@Override

src/main/java/com/uas/platform/b2c/common/account/v2/controller/EnterpriseController.java

@@ -27,9 +27,9 @@ public class EnterpriseController {
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
 	public void update(UserSpaceView userSpaceView, UserView userView) {
-	if (null != userSpaceView) {
-		userSpaceView.setAdmin(userView);
-		enterpriseService.update(userSpaceView);
+		if (null != userSpaceView) {
+			userSpaceView.setAdmin(userView);
+			enterpriseService.update(userSpaceView);
 		}
 	}
 

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

@@ -65,20 +65,12 @@ public class EnterpriseServiceImpl implements EnterpriseService {
         //Long userUU = admins.get(0).getUserUU();
         enterprise.setEnAdminuu(userSpaceView.getAdminUU());
         Enterprise newEn = enterpriseDao.save(enterprise);
-       /* List<User> users = userDao.findUserByUserTel(userSpaceDetail.getAdminTel());
-        if (!CollectionUtils.isEmpty(users)){
-            User adminUser = users.get(0);
-            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);
-        }*/
+
+        User adminUser = userDao.findOne(newEn.getEnAdminuu());
+        if (adminUser != null) {
+            adminUser.addEnterprise(newEn);
+        }
+
         if(oldenterprise != null && oldenterprise.getUu() != null) {
             logger.log("更新企业信息", enterprise.getUu()+"time: " + sdf.format(new Date()), enterprise.getUu(), 0L);
         } else {