Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer

gic-store-api/src/main/java/com/gic/store/service/StoreImportApiService.java

@@ -180,7 +180,7 @@ public interface StoreImportApiService {
      * @return com.gic.api.base.commons.ServiceResponse<java.lang.Boolean>
      * @throws 
      */
-    ServiceResponse<Boolean> validateStoreName(Integer enterpriseId, String storeName);
+    ServiceResponse<Boolean> validateStoreName(Integer enterpriseId, Integer regionId, String storeName);
     
     /**
      * @Title: getStoreBatchProcess

gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreImportApiServiceImpl.java

@@ -12,7 +12,6 @@ import com.gic.store.dto.StoreFieldDTO;
 import com.gic.store.dto.StoreTmpDTO;
 import com.gic.store.entity.TabStoreBrand;
 import com.gic.store.entity.TabStoreExtend;
-import com.gic.store.entity.TabStoreField;
 import com.gic.store.entity.TabStoreGroup;
 import com.gic.store.service.*;
 import org.apache.commons.collections.CollectionUtils;
@@ -250,8 +249,8 @@ public class StoreImportApiServiceImpl implements StoreImportApiService {
     }
 
     @Override
-    public ServiceResponse<Boolean> validateStoreName(Integer enterpriseId, String storeName) {
-        return ServiceResponse.success(storeService.countByStoreName(enterpriseId, storeName, null) > 0);
+    public ServiceResponse<Boolean> validateStoreName(Integer enterpriseId, Integer regionId, String storeName) {
+        return ServiceResponse.success(storeService.validateStoreNameIsExist(enterpriseId, regionId, storeName, null));
     }
 
     @Override