Merge remote-tracking branch 'origin/dev-mysql' into dev-mysql

src/main/java/com/uas/platform/b2c/prod/store/facade/impl/StoreInFacadeImpl.java

@@ -93,6 +93,7 @@ public class StoreInFacadeImpl implements StoreInFacade {
 				return new ResultMap(CodeType.PARAMETER_ERROR, "店铺更新基础信息时，企业信息不能为空");
 			}
 			store.setStoreShortName(StringUtils.hasText(newStoreInfo.getStoreShortName()) ? newStoreInfo.getStoreShortName() : null);
+			store.setStoreName(StringUtils.hasText(newStoreInfo.getStoreName()) ? newStoreInfo.getStoreName() : null);
 			store.setDescription(newStoreInfo.getDescription());
 			EnterpriseSimple enterprise = store.getEnterprise();
 			enterprise.setEnUrl(newStoreInfo.getEnterprise().getEnUrl());

src/main/java/com/uas/platform/b2c/prod/store/service/impl/StoreInServiceImpl.java

@@ -168,11 +168,19 @@ public class StoreInServiceImpl implements StoreInService {
 		if (enUU == null) {
 			return null;
 		}
+
 		List<StoreIn> storeIns = storeDao.findByEnUU(enUU);
 		if(CollectionUtils.isEmpty(storeIns)) {
 			return null;
 		}else {
-			return storeIns.get(0);
+			StoreIn storeInsOne = storeIns.get(0);
+			EnterpriseSimple enterpriseSimple = EnterpriseSimple.translateSimple(SystemSession.getUser().getEnterprise());
+			if (enterpriseSimple.getEnName().equals(storeInsOne.getEnterprise().getEnName())) {
+				return storeInsOne;
+			} else {
+				storeInsOne.setEnterprise(enterpriseSimple);
+				return storeDao.save(storeInsOne);
+			}
 		}
 	}
 

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

@@ -28,7 +28,7 @@ define(['app/app', 'calendar'], function(app) {
                     jsonpCallback:"successCallback",
                     success:function(data){
                         console.log(data);
-                        window.open = urlPrex + '/sso/center?type=apply';
+                        window.open(urlPrex + '/sso/center?type=apply');
                     },
                     error:function(data) {
                         console.log(data);

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

@@ -73,6 +73,7 @@ define(['app/app'], function (app) {
 			$scope.enterprise = $scope.storeInfo.enterprise || null;
 			$scope.sampleStore = {};
 			$scope.sampleStore.storeShortName = $scope.storeInfo.storeShortName;
+            $scope.sampleStore.storeName = $scope.storeInfo.storeName;
 			$scope.sampleStore.description = $scope.storeInfo.description;
 			$scope.sampleStore.enterprise = angular.copy($scope.storeInfo.enterprise);
 			$scope.sampleStore.enterprise.address = $scope.sampleStore.enterprise.address || $scope.storeInfo.enterprise.enAddress;
@@ -156,6 +157,7 @@ define(['app/app'], function (app) {
 		$scope.undoModify = function (module) {
 			if (module == 'BASIC_INFO') {
 				$scope.sampleStore.storeShortName = $scope.storeInfo.storeShortName;
+                $scope.sampleStore.storeName = $scope.storeInfo.storeName;
 				$scope.sampleStore.description = $scope.storeInfo.description;
 				$scope.sampleStore.enterprise = angular.copy($scope.storeInfo.enterprise);
 				$scope.sampleStore.enterprise.address = $scope.sampleStore.enterprise.address || $scope.storeInfo.enterprise.enAddress;
@@ -237,6 +239,7 @@ define(['app/app'], function (app) {
 			}
 			var store = {};
 			store.storeShortName = $scope.sampleStore.storeShortName;
+            store.storeName = $scope.sampleStore.storeName;
 			store.description = $scope.sampleStore.description;
 			store.enterprise = angular.copy($scope.sampleStore.enterprise);
 			saveChanges(store, 'BASIC_INFO');

src/main/webapp/resources/view/vendor/forstore/seekPurchase.html

@@ -366,7 +366,7 @@
     .seek-purchase .say-price-box {
       /*  display: none;*/
         position: fixed;
-        width: 480px;
+        width: 476px;
         top: 30%;
         left: 33%;
         /*-webkit-box-shadow: 0 5px 15px rgba(0,0,0,.5);
@@ -377,21 +377,23 @@
     }
     .seek-purchase .say-price-box .title {
         position: relative;
-        height: 44px;
+        height: 38px;
         background: #4290f7;
-        line-height: 44px;
+        line-height: 38px;
         color: #fff;
         border-top-right-radius: 5px;
         border-top-left-radius: 5px;
-    }
-    .seek-purchase .say-price-box .title > div {
-        display: inline-block;
-        padding-left: 57px;
-        width: 47%;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-    }
+        font-weight: bold;
+        padding-left: 20px;
+    }
+    /*.seek-purchase .say-price-box .title > div {*/
+        /*display: inline-block;*/
+        /*padding-left: 57px;*/
+        /*width: 47%;*/
+        /*overflow: hidden;*/
+        /*text-overflow: ellipsis;*/
+        /*white-space: nowrap;*/
+    /*}*/
     .seek-purchase .say-price-box .title i {
         position: absolute;
         right: 10px;
@@ -399,11 +401,11 @@
         cursor: pointer;
     }
     .seek-purchase .say-price-box .content {
-        padding: 9px 0;
+        padding: 9px 0 0 0;
         background: #fff;
     }
     .seek-purchase .say-price-box .content .content-line {
-        margin: 0 0 14px 0;
+        padding: 0 0 14px 0;
     }
     .seek-purchase .say-price-box .content .content-line .form-item {
         display: inline-block;
@@ -509,9 +511,9 @@
         border-bottom-left-radius: 5px;
         border-bottom-right-radius: 5px;
         background: #fff;
-        height: 62px;
+        height: 52px;
         text-align: center;
-        padding-top: 15px;
+        padding-top: 12px;
     }
     .seek-purchase .say-price-box .operate span {
         display: inline-block;
@@ -522,6 +524,7 @@
         background: #4290f7;
         color: #fff;
         cursor: pointer;
+        border-radius: 2px;
     }
     .seek-purchase .say-price-box .operate span:last-child {
         margin-left: 15px;

src/main/webapp/resources/view/vendor/forstore/vendor_store_maintain.html

@@ -666,14 +666,22 @@
 					</div>
 				</div>
 			</div>
-			<div class="row com_row" style="margin-top: 10px;">
+			<div class="row com_row" >
 				<div class="col-md-2 custom_col">
-					<span>店铺名称</span>
+					<span>店铺简称</span>
 				</div>
 				<div class="col-md-10 custom_col">
 					<input type="text" class="form-control" style="border-radius: inherit;" title="storeShortName" ng-model="sampleStore.storeShortName" maxlength="100"/>
 				</div>
 			</div>
+			<div class="row com_row" >
+				<div class="col-md-2 custom_col">
+					<span>店铺名称</span>
+				</div>
+				<div class="col-md-10 custom_col">
+					<input type="text" class="form-control" style="border-radius: inherit;" title="storeName" ng-model="sampleStore.storeName" maxlength="100"/>
+				</div>
+			</div>
 			<div class="row com_row">
 				<div class="col-md-2 custom_col">
 					<span>简&nbsp;&nbsp;&nbsp;&nbsp;介<strong class="text-inverse">*</strong></span>
@@ -727,9 +735,9 @@
 					</a>
 				</div>
 			</div>
-			<div class="row com_row" style="margin-top: 10px;">
+			<div class="row com_row">
 				<div class="col-md-2 custom_col">
-					<span>店铺名称</span>
+					<span>店铺简称</span>
 				</div>
 				<div class="col-md-10 custom_col show_info">
 					<div>
@@ -737,6 +745,16 @@
 					</div>
 				</div>
 			</div>
+			<div class="row com_row">
+				<div class="col-md-2 custom_col">
+					<span>店铺名称</span>
+				</div>
+				<div class="col-md-10 custom_col show_info">
+					<div>
+						{{sampleStore.storeName || '暂无信息'}}
+					</div>
+				</div>
+			</div>
 			<div class="row com_row">
 				<div class="col-md-2 custom_col">
 					<span>简&nbsp;&nbsp;&nbsp;&nbsp;介</span>