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/java/com/uas/platform/b2c/trade/seek/service/impl/SeekPurchaseBomServiceImpl.java

@@ -109,7 +109,6 @@ public class SeekPurchaseBomServiceImpl implements SeekPurchaseBomService {
 
     private int mallColNum = 8;
     private int mallRowNum = 500;
-    private int startRow = 2;
 
     /**
      * 导入bom
@@ -147,7 +146,8 @@ public class SeekPurchaseBomServiceImpl implements SeekPurchaseBomService {
                 return new ResultMap(CodeType.PARAMETER_ERROR, "您上传的信息列信息不正确，请与模板的列做比较");
             }
             List<SeekPurchaseByBatch> seekPurchaseByBatchList = new ArrayList<>();
-            if (vaidSample(sheet.getRow(startRow))) {
+            int startRow = 2;
+            if (sheet.getRow(startRow) != null && vaidSample(sheet.getRow(startRow))) {
                 startRow = 3;
             }
             for (int r = startRow; r <= rowNum; r++) {
@@ -553,7 +553,7 @@ public class SeekPurchaseBomServiceImpl implements SeekPurchaseBomService {
 
     @Override
     public Map<String, Object> getImportBomInfo(Long bomId) {
-        String sql = "select bom_id,count(bom_id) as successImport,(count(sp_brand or sp_code or sp_deadline is null)) as nullField "
+        String sql = "select bom_id,count(bom_id) as successImport,(sum((sp_brand is null or sp_code is null or sp_deadline is null))) as nullField "
                 + "from trade$seek_purchase_by_batch where bom_id = ? group by bom_id";
         try {
             Map<String, Object> map = jdbcTemplate.queryForMap(sql, new Object[]{bomId});

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/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>