Merge remote-tracking branch 'origin/release-201813-yc' into release-201813-yc

# Conflicts:
#	src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/ReleaseProductByBatchServiceImpl.java

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

@@ -380,14 +380,36 @@ public class SecurityController {
 			// 企业判断
 			Enterprise enterprise = new Enterprise();
 			if (userAccount.getSpaceUU() != null) {
-				enterprise = enterpriseDao.findByUu(userAccount.getSpaceUU());
+				Enterprise oldEnterprise = enterpriseDao.findByUu(userAccount.getSpaceUU());
 				// 判断商城是否存在当前企业，若存在则设置当前企业即可，若不存在则需新建一个企业后进行设置
-				if (enterprise == null) {
+				if (oldEnterprise == null) {
 					// 从账户中心获取当前企业信息尽心保存
 					UserSpaceView userSpaceView = AccountUtils.findBySpaceUU(userAccount.getSpaceUU());
 					if (userSpaceView != null) {
-						enterprise = enterpriseService.update(userSpaceView);
+						if (!StringUtils.isEmpty(userSpaceView.getAccessSecret())) {
+							enterprise.setAccessSecret(userSpaceView.getAccessSecret());
+						}
+						enterprise.setEnAddress(userSpaceView.getRegAddress());
+						enterprise.setEnCorporation(userSpaceView.getCorporation());
+						enterprise.setEnBussinessCode(userSpaceView.getBusinessCode());
+						String enTel = enterprise.getEnTel();
+						if (enTel == null) {
+							enterprise.setEnTel(userSpaceView.getTelephone());
+							if (userSpaceView.getTelephone() == null) {
+								enterprise.setEnTel(userSpaceView.getAdmin().getMobile());
+							}
+						}
+						enterprise.setEnName(userSpaceView.getSpaceName());
+						enterprise.setEnLogoUrl(userSpaceView.getBusinessCodeImage());
+						enterprise.setUu(Long.valueOf(userSpaceView.getSpaceUU()));
+						if (userSpaceView.getAdminUU() != null) {
+							enterprise.setEnAdminuu(userSpaceView.getAdminUU());
+						}
+						enterprise.setEnValidCode(userSpaceView.getValidCode());
+						enterprise = enterpriseDao.save(enterprise);
 					}
+				} else {
+					enterprise = oldEnterprise;
 				}
 			}
 			// 没用用户

src/main/webapp/resources/js/usercenter/controllers/forstore/messagePersonalCtrl.js

@@ -379,7 +379,7 @@ define(['app/app'], function(app) {
                             if(message.type =="MALL跳转卖家待报价页面"){
                                 message.url='/vendor#/seekPurchase?type=1';
                             }else if (message.type =="MALL公共询价"){
-                                message.url='/user#/seekPurchase';
+                                message.url='/user#/seekPurchase?seekType=1';
                             }else if (message.type =="商城公共询价采纳结果"){
                                 message.url='/vendor#/vendorPurchaseOffer';
                             }

src/main/webapp/resources/js/usercenter/controllers/forstore/seek_purchase_ctrl.js

@@ -5,9 +5,9 @@
 define(['app/app', 'clipboard', 'QRCode'], function (app, clipboard, QRCode) {
   'use strict';
   app.register.controller('seekPurchaseCtrl',
-      ['$scope', '$rootScope', 'seekPurchase', 'toaster', 'BaseService',
+      ['$scope', '$location', '$rootScope', 'seekPurchase', 'toaster', 'BaseService',
         'ngTableParams', 'Order', 'SessionService', '$filter', '$upload', '$stateParams', 'Search', '$http',
-        function ($scope, $rootScope, seekPurchase, toaster, BaseService,
+        function ($scope, $location, $rootScope, seekPurchase, toaster, BaseService,
             ngTableParams, Order, SessionService, $filter, $upload, $stateParams, Search, $http) {
           $rootScope.active = 'seek_purchase';
           document.title = '我的求购-优软商城';
@@ -24,9 +24,14 @@ define(['app/app', 'clipboard', 'QRCode'], function (app, clipboard, QRCode) {
             })
           }
           var enIdFilter = $filter('EncryptionFilter');
+            if ($location.search().seekType === '1') {
+                $scope.tab = 'offered'
+            } else {
+                $scope.tab = 'waitOffer';
+            }
           seekPurchase.getSeekUrl({}, function(data) {
             var seekUrl = data.url;
-            $scope.tab = 'waitOffer';
+            /*$scope.tab = 'waitOffer';*/
             $scope.toogleTab = function (tab) {
                 $scope.tab = tab;
               $scope.seekPurchaseTableParams = new ngTableParams({
@@ -96,8 +101,13 @@ define(['app/app', 'clipboard', 'QRCode'], function (app, clipboard, QRCode) {
                 }
               });
             }
-          $scope.toogleTab('waitOffer');
-          $scope.applyObj = {
+              if ($location.search().seekType === '1') {
+                  $scope.toogleTab('offered');
+              } else {
+                  $scope.toogleTab('waitOffer')
+              }
+
+              $scope.applyObj = {
               code: '',
               brand: '',
               unitPrice: '',

src/main/webapp/resources/js/vendor/app.js

@@ -699,15 +699,17 @@ define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'commo
 				if ($location.$$path === '/index') {
 					if ($rootScope.applyStatus === 'NONE') {
 						$state.go('vendor_store_apply');
-					} else if ($rootScope.applyStatus === 'PASS') {
-						$state.go('vendor_store_maintain');
 					}
+					// else if ($rootScope.applyStatus === 'PASS') {
+					// 	$state.go('vendor_store_maintain');
+					// }
 				}
                 // 是否pcb
-                StoreInfo.isPcb({enuu: $rootScope.userInfo.enterprise.uu}, function (res) {
-                    $rootScope.isPcbStore = res.data == 1;
-                }, function (error) {
-                });
+                // StoreInfo.isPcb({enuu: $rootScope.userInfo.enterprise.uu}, function (res) {
+                //     $rootScope.isPcbStore = res.data == 1;
+                // }, function (error) {
+                // });
+				$rootScope.isPcbStore = false;
 			}).error(function (error) {
 				toaster.pop('error', '获取登录信息失败');
 			})

src/main/webapp/resources/js/vendor/controllers/forstore/messagePersonalCtrl.js

@@ -339,7 +339,7 @@ define(['app/app'], function(app) {
                             if(message.type =="MALL跳转卖家待报价页面"){
                                 message.url='/vendor#/seekPurchase?type=1';
                             }else if (message.type =="MALL公共询价"){
-                                message.url='/user#/seekPurchase';
+                                message.url='/user#/seekPurchase?seekType=1';
                             }else if (message.type =="商城公共询价采纳结果"){
                                 message.url='/vendor#/vendorPurchaseOffer';
                             }