日志

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

@@ -144,6 +144,12 @@ public class ClerkImportController {
                         logCount++;
                     }
 
+                    if (sb.length() > 0 && logCount > 0) {
+                        sb.deleteCharAt(sb.length() - 1);
+                        sb.append("等").append(logCount).append("名导购");
+                    }
+                    LogUtils.createLog("批量导入", sb.toString());
+
                     if (clerkImportApiService.hasImportingClerk(enterpriseId).getResult()) {
                         // 开队列
                         String r = clerkImportApiService.importDataToClerk(enterpriseId, "123", uuId).getResult();
@@ -151,11 +157,6 @@ public class ClerkImportController {
                             logger.warn("队列错误, {}", r);
                             return RestResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "网络错误");
                         }
-                        if (sb.length() > 0 && logCount > 0) {
-                            sb.deleteCharAt(sb.length() - 1);
-                            sb.append("等").append(logCount).append("名导购");
-                        }
-                        LogUtils.createLog("批量导入", sb.toString());
                     } else {
                         Page page = clerkImportApiService.listClerkTmp(enterpriseId, false, pageQO.getCurrentPage(), pageQO.getPageSize()).getResult();
                         Map<Object, Object> result = new HashMap<>(8);

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

@@ -168,6 +168,12 @@ public class StoreImportController {
                         logCount++;
                     }
 
+                    if (sb.length() > 0 && logCount > 0) {
+                        sb.deleteCharAt(sb.length() - 1);
+                        sb.append("等").append(logCount).append("家门店");
+                    }
+                    LogUtils.createLog("批量导入", sb.toString());
+
                     if (storeImportApiService.hasImportingStore(enterpriseId).getResult()) {
                         // userId
                         Integer userId = UserDetailUtils.getUserDetail().getUserInfo().getUserId();
@@ -177,11 +183,6 @@ public class StoreImportController {
                             logger.warn("队列错误, {}", r);
                             return RestResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "网络错误");
                         }
-                        if (sb.length() > 0 && logCount > 0) {
-                            sb.deleteCharAt(sb.length() - 1);
-                            sb.append("等").append(logCount).append("家门店");
-                        }
-                        LogUtils.createLog("批量导入", sb.toString());
                     } else {
                         Page page = storeImportApiService.listStoreTmp(enterpriseId, false, pageQO.getCurrentPage(), pageQO.getPageSize()).getResult();
                         Map<Object, Object> result = new HashMap<>(8);