Browse Source

注册企业流程更新,bug更新

wangdy 8 years ago
parent
commit
5888e91f04

+ 1 - 1
src/main/java/com/uas/platform/b2c/common/account/controller/UserController.java

@@ -278,6 +278,6 @@ public class UserController {
 	@RequestMapping(value = "/userCacheEnterprise", method = RequestMethod.DELETE)
 	@ResponseBody
 	public void deleteUserCacheEnterprise() {
-		userService.getUserCacheEnterprise(SystemSession.getUser());
+		userService.deleteUserCacheEnterprise(SystemSession.getUser());
 	}
 }

+ 15 - 0
src/main/java/com/uas/platform/b2c/common/account/model/Enterprise.java

@@ -90,6 +90,13 @@ public class Enterprise implements Serializable {
 	 */
 	@Column(name = "en_businesscode")
 	private String enBussinessCode;
+
+	/**
+	 * 商业登记证图片
+	 */
+	@Column(name = "en_businesscodeimg")
+	private String enBussinessCodeImage;
+
 	/**
 	 * 公司主页地址
 	 */
@@ -383,6 +390,14 @@ public class Enterprise implements Serializable {
 		this.enLogoUrl = enLogoUrl;
 	}
 
+	public String getEnBussinessCodeImage() {
+		return enBussinessCodeImage;
+	}
+
+	public void setEnBussinessCodeImage(String enBussinessCodeImage) {
+		this.enBussinessCodeImage = enBussinessCodeImage;
+	}
+
 	/**
 	 * saas用户
 	 * 

+ 1 - 1
src/main/java/com/uas/platform/b2c/common/account/model/UserInfo.java

@@ -41,12 +41,12 @@ public class UserInfo {
 				Map<String, Object> map = new HashMap<String, Object>();
 				map.put("enName", enterprise.getEnName());
 				map.put("uu", enterprise.getUu());
+				map.put("isVendor",enterprise.getEnMallVendorStatus());
 				if(enterprise.getEnSaasStatus() != null && enterprise.getEnSaasStatus() == Status.ENABLED.value()) {
 					map.put("enSaasUrl", enterprise.getEnSaasUrl());
 				}
 				if (enterprise.equals(current)){
 					map.put("current", true);
-					map.put("isVendor",enterprise.getEnMallVendorStatus());
 				}
 				list.add(map);
 			}

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

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

+ 4 - 0
src/main/webapp/resources/js/vendor/controllers/forstore/vendor_index_ctrl.js

@@ -6,6 +6,10 @@ define(['app/app', 'calendar'], function(app) {
     'use strict';
     app.register.controller('vendorIndexCtrl', ['$scope', 'toaster', 'VendorService', '$rootScope', 'News', '$filter', function($scope, toaster, VendorService, $rootScope, News, $filter) {
         $rootScope.active = 'index';
+        //个人账户
+        if (!$rootScope.userInfo.enterprise){
+            window.location.href = './register-saler';
+        }
         VendorService.getVendorInfo(null, function(data){
             $scope.vendor = data;
         }, function(response) {

+ 2 - 1
src/main/webapp/resources/view/common/site-nav.html

@@ -160,7 +160,8 @@
         </li>
         <li><a href=".">商城首页</a></li>
         <li ng-if="userInfo"><a href="user">买家中心</a></li>
-        <li ng-if="userInfo.enterprises"><a href="vendor">卖家中心</a></li>
+        <li ng-if="userInfo.enterprise"><a href="vendor">卖家中心</a></li>
+        <li ng-if="!userInfo.enterprise"><a href="./register-saler">卖家中心</a></li>
         <li><a href="help/home" target="_blank">帮助中心</a></li>
         <!-- <li><a href="http://wpa.qq.com/msgrd?v=3&uin=3432892085&site=www.ubtoc.com&menu=yes" target="_blank">在线客服</a></li> -->
        <!-- <li><a href="javascript:void(0)">服务电话:400-830-1818</a></li>-->