门店批量导入，如果是替换code，则门店名称重复不再验证

gic-store-web/src/main/java/com/gic/store/web/controller/StoreImportController.java

@@ -123,6 +123,13 @@ public class StoreImportController {
         if (file.getSize() > 0) {
             String fileName = file.getOriginalFilename();
             String uuId = request.getParameter("uuId");
+            //获取配置信息，是否门店替换code
+            String repeatStoreCodeConfig = request.getParameter("repeatStoreCodeConfig");
+            if (StringUtils.isBlank(repeatStoreCodeConfig)) {
+                repeatStoreCodeConfig = "0";
+            }
+            //如果门店code重复，是否替换更新
+            boolean isReplace = "1".equals(repeatStoreCodeConfig);
             if (fileName.endsWith("xlsx") || fileName.endsWith("xls")) {
                 try {
                     Workbook workbook = ExcelUtils.getWorkbookFromUpload(file.getInputStream(), fileName);
@@ -141,7 +148,7 @@ public class StoreImportController {
                     storeImportApiService.delStoreTmp(enterpriseId);
                     //批量插入数据到门店临时表，用于队列导入到门店表
                     for (Map<Integer, String> row : data) {
-                        StoreTmpDTO bean = this.validateData(row, enterpriseId, storeRegion.getRegionId());
+                        StoreTmpDTO bean = this.validateData(row, enterpriseId, storeRegion.getRegionId(), isReplace);
                         bean.setRegionId(storeRegion.getRegionId());
                         bean.setRegionName(storeRegion.getRegionName());
                         try {
@@ -159,13 +166,6 @@ public class StoreImportController {
                         // userId
                         Integer userId = UserDetailUtils.getUserDetail().getUserInfo().getUserId();
                         // 开队列
-                        //获取配置信息
-                        String repeatStoreCodeConfig = request.getParameter("repeatStoreCodeConfig");
-                        if (StringUtils.isBlank(repeatStoreCodeConfig)) {
-                            repeatStoreCodeConfig = "0";
-                        }
-                        //如果门店code重复，是否替换更新
-                        boolean isReplace = "1".equals(repeatStoreCodeConfig);
                         String r = storeImportApiService.importDataToStore(enterpriseId, userId.toString(), uuId, isReplace).getResult();
                         if (StringUtils.isNotBlank(r)) {
                             logger.warn("队列错误, {}", r);
@@ -300,7 +300,7 @@ public class StoreImportController {
         }
     }
 
-    private StoreTmpDTO validateData(Map<Integer, String> row, Integer enterpriseId, Integer regionId) {
+    private StoreTmpDTO validateData(Map<Integer, String> row, Integer enterpriseId, Integer regionId, boolean isNeedReplaceStoreCode) {
         boolean validate = true;
         StoreTmpDTO bean = new StoreTmpDTO();
         bean.setEnterpriseId(enterpriseId);
@@ -320,7 +320,7 @@ public class StoreImportController {
                 validate = false;
             }
         }
-        if (validate) {
+        if (!isNeedReplaceStoreCode && validate) {
             // 验证门店code唯一
             if (storeImportApiService.validateStoreName(enterpriseId, storeName).getResult()) {
                 bean.setErrorMessage("门店名称已经存在");
@@ -343,7 +343,7 @@ public class StoreImportController {
                 validate = false;
             }
         }
-        if (validate) {
+        if (!isNeedReplaceStoreCode && validate) {
             // 验证门店code唯一
             if (storeImportApiService.validateStoreCode(enterpriseId, regionId, storeCode).getResult()) {
                 bean.setErrorMessage("门店编码重复");