Browse Source

解决个人注册企业数据异步出错的bug

suntg 7 years ago
parent
commit
21249f890d

+ 2 - 2
src/main/java/com/uas/platform/b2c/common/account/controller/AuthenticationController.java

@@ -54,7 +54,7 @@ public class AuthenticationController {
 				user.setIssys(Constant.NO);
 			}
 		}
-		request.getSession().setAttribute("user",user);
+		request.getSession().setAttribute("user", user);
 		UserInfo userInfo = new UserInfo(user);
 		Integer hasQuestion = user.getHasQuestion();
 		if (hasQuestion != null && hasQuestion ==1) {
@@ -82,7 +82,7 @@ public class AuthenticationController {
 			return null;
 		}
 		User user = userService.findUserByUserUU(SystemSession.getUser().getUserUU());
-		request.getSession().setAttribute("user",user);
+		request.getSession().setAttribute("user", user);
 		return new UserInfo(user);
 	}
 

+ 5 - 4
src/main/java/com/uas/platform/b2c/common/account/service/impl/EnterpriseServiceImpl.java

@@ -217,7 +217,7 @@ public class EnterpriseServiceImpl implements EnterpriseService{
 
 	@Override
 	public ResultMap registerEnterprise(FormEnterprise enterprise, String filePath, User user) {
-		//封装注册时的个人账户信息;
+		// 封装注册时的个人账户信息;
 		if (user == null) {
 			throw new RuntimeException("登录异常:用户不存在!");
 		}
@@ -234,7 +234,7 @@ public class EnterpriseServiceImpl implements EnterpriseService{
 		if (imid != null) {
 			userView.setImId(imid.toString());
 		}
-		//封装注册企业信息;
+		// 封装注册企业信息;
 		detail.setSpaceName(enterprise.getName());
 		detail.setCorporation(enterprise.getLawPerson());
 		detail.setAdmin(userView);
@@ -259,8 +259,9 @@ public class EnterpriseServiceImpl implements EnterpriseService{
 		try {
 			JSONObject data = JSON.parseObject(JSON.toJSONString(detail));
 			String userSpa = data.toJSONString();
-			// 调用账户中心的接口注册企业
-			detail = AccountUtils.register(detail, userView);
+			// 调用账户中心的接口注册企业,账户中心不会回调保存,需要我们自己保存,以实现同步
+			detail = AccountUtils.register(detail, userView, false);
+			// 自己保存企业到商城数据库
 			v2EnterpriserService.update(detail);
 		} catch (Exception e) {
 			return new ResultMap(CodeType.SYSTEM_ERROR, e.getMessage());

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

@@ -45,7 +45,7 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 
 
     @Override
-    public synchronized Enterprise update(UserSpaceView userSpaceView) {
+    public Enterprise update(UserSpaceView userSpaceView) {
       /*  List<User> admins = userDao.findUserByUserUU(userSpaceView.getAdminUU());
         if (admins.size() != 1) {
             logger.log("更新企业信息出错,管理员有且仅有一个", "当前管理员数量:" + admins.size());

+ 0 - 95
src/main/webapp/WEB-INF/views/normal/user_center-0321.html

@@ -1,95 +0,0 @@
-<!DOCTYPE HTML>
-<html lang="zh-CN">
-<head>
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
-<meta name="renderer" content="webkit">
-<title>买家中心-优软商城</title>
-<meta name="description" content="优软商城,电子元器件搜索引擎" />
-<meta name="keywords"
-	content="优软商城,B2B,B2C,行业门户,网上贸易,电子商务,网上贸易,网上交易,交易市场,在线交易,供求信息,采购,求购信息,供应信息" />
-<link href="static/img/all/u.png" rel="icon" type="image/x-icon" />
-<link rel="stylesheet" href="static/lib/bootstrap/css/bootstrap.min.css" />
-<link rel="stylesheet"
-	href="static/lib/fontawesome/css/font-awesome.min.css" />
-<link rel="stylesheet"
-	href="static/lib/jquery/themes/summernote/css/summernote.css" />
-<link rel="stylesheet" href="static/lib/iconfont/css/iconfont.css" />
-<link rel="stylesheet"
-	href="static/lib/jquery/themes/uploadify/uploadify.css" />
-<link rel="stylesheet" href="static/lib/angular/toaster.css" />
-<link rel="stylesheet" href="static/css/common.css" />
-<link rel="stylesheet" href="static/css/usercenter.css" />
-
-</head>
-<body>
-	<!-- 消息提示框  Start-->
-	<toaster-container
-		toaster-options="{'position-class': 'toast-bottom-center'}"></toaster-container>
-	<!-- 消息提示框 End -->
-	<!-- Loading Start -->
-	<div id="loading" class="loading">
-		<i></i>
-	</div>
-	<!-- Loading End -->
-
-	<!-- header 标题Logo和搜索框 Start -->
-	<div ng-include src="'static/view/common/header.html'"></div>
-	<!-- header 标题Logo和搜索框 End -->
-	<!-- navigation 导航栏 Start -->
-	<div ng-include src="'static/view/common/nav.html'"></div>
-	<!-- navigation 导航栏  End -->
-
-	<!-- Start -->
-	<div class="main-panel" id="main">
-		<div class="container">
-			<!-- 左侧导航栏 Start -->
-			<div class="left">
-				<div ng-include src="'static/view/usercenter/left.html'"></div>
-			</div>
-			<!-- 左侧导航栏 End -->
-			<!-- 核心内容 Start -->
-			<div class="right">
-				<div ui-view></div>
-			</div>
-			<!-- 核心内容 End -->
-		</div>
-	</div>
-	<!-- End -->
-	<!-- 页脚 Start -->
-	<div ng-include src="'static/view/common/footer.html'"></div>
-	<!-- 页脚 End -->
-
-	<!-- 侧边栏Start -->
-	<div ng-include src="'static/view/common/sidebar.html'"></div>
-	<!-- 侧边栏End -->
-
-	<script type="text/javascript" src="static/lib/require.js"
-		data-main="static/js/usercenter/main.js"></script>
-	<script type="text/ng-template" id="offer/image/insert.html">
-		<div class="modal-header">
-			<button type="button" class="close" ng-click="close()">×</button>
-			<h4 class="modal-title">插入图片</h4>
-		</div>
-		<div class="modal-body">
-			<div class="row">
-				<div class="col-xs-7" style="padding: 20px;">
-					<p class="help-block">提示:选择的图片单张大小不超过3MB,支持jpg,jpeg,gif,bmp,png</p>
-					<div class="upload-container" ng-disabled="getImages().length == images.length">
-						<div id="uploadify" on-success="onUploadSuccess($data)" uploadify="{buttonText:'选择图片'}"></div>
-					</div>
-				</div>
-				<div class="col-xs-5">
-					<h3>预览</h3>
-					<div class="image-content">
-						<img ng-src="{{image.src}}" class="img-thumbnail" style="width: 100px; height: 100px;">
-					</div>
-				</div>
-			</div>
-		</div>
-		<div class="modal-footer">
-			<div class="pull-right"><a ng-click="confirm()" class="btn btn-primary" ng-disabled="!image.src">确定</a></div>
-		</div>
-	</script>
-</body>
-</html>

+ 0 - 68
src/main/webapp/WEB-INF/views/normal/vendor_center-0323.html

@@ -1,68 +0,0 @@
-<!DOCTYPE HTML>
-<html lang="zh-CN">
-<head>
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
-<meta name="renderer" content="webkit">
-<title>卖家中心-优软商城</title>
-<meta name="description" content="优软商城,电子元器件搜索引擎" />
-<meta name="keywords"
-	content="优软商城,B2B,B2C,行业门户,网上贸易,电子商务,网上贸易,网上交易,交易市场,在线交易,供求信息,采购,求购信息,供应信息" />
-<link href="static/img/all/u.png" rel="icon" type="image/x-icon" />
-<link rel="stylesheet" href="static/lib/bootstrap/css/bootstrap.min.css" />
-<link rel="stylesheet" href="static/lib/angular/ng-table.css" />
-<link rel="stylesheet"
-	href="static/lib/fontawesome/css/font-awesome.min.css" />
-<link rel="stylesheet" href="static/lib/iconfont/css/iconfont.css" />
-<link rel="stylesheet" href="static/lib/angular/toaster.css" />
-<link rel="stylesheet" href="static/css/common.css" />
-<link rel="stylesheet" href="static/css/vendor.css" />
-</head>
-<body>
-	<!-- 消息提示框  Start-->
-	<toaster-container
-		toaster-options="{'position-class': 'toast-bottom-center'}"></toaster-container>
-	<!-- 消息提示框 End -->
-	<!-- Loading Start -->
-	<div id="loading" class="loading">
-		<i></i>
-	</div>
-	<!-- Loading End -->
-
-	<!-- header 标题Logo和搜索框 Start -->
-	<div ng-include src="'static/view/common/header.html'"></div>
-	<!-- header 标题Logo和搜索框 End -->
-
-	<!-- navigation 导航栏 Start -->
-	<div ng-include src="'static/view/common/nav.html'"></div>
-	<!-- navigation 导航栏  End -->
-
-	<!-- 主体内容 Start -->
-	<div class="main-panel" id="main">
-		<div class="container">
-			<!-- 左侧导航栏 Start -->
-			<div class="left">
-				<div ng-include src="'static/view/vendor/left.html'"></div>
-			</div>
-			<!-- 左侧导航栏 End -->
-			<!-- 核心内容 Start -->
-			<div class="right">
-				<div ui-view></div>
-			</div>
-			<!-- 核心内容 End -->
-		</div>
-	</div>
-	<!-- 主体内容 End -->
-
-	<!-- 页脚 Start -->
-	<div ng-include src="'static/view/common/footer.html'"></div>
-	<!-- 页脚 End -->
-
-	<!-- 侧边栏Start -->
-	<div ng-include src="'static/view/common/sidebar.html'"></div>
-	<!-- 侧边栏End -->
-
-	<script type="text/javascript" src="static/lib/require.js"
-		data-main="static/js/vendor/main.js"></script>
-</body>
-</html>