导购导入优化

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

@@ -6,6 +6,7 @@ import com.gic.api.base.commons.ServiceResponse;
 import com.gic.commons.util.EntityUtil;
 import com.gic.store.constant.*;
 import com.gic.store.dto.*;
+import com.gic.store.entity.TabClerk;
 import com.gic.store.entity.TabClerkPosition;
 import com.gic.store.entity.TabClerkTmp;
 import com.gic.store.service.*;
@@ -35,6 +36,8 @@ public class ClerkTaskServiceImpl extends AbstractTaskAllocationOperation implem
 
     @Autowired
     private ClerkApiService clerkApiService;
+    @Autowired
+    private ClerkService clerkService;
 
     @Autowired
     private StoreService storeService;
@@ -128,8 +131,20 @@ public class ClerkTaskServiceImpl extends AbstractTaskAllocationOperation implem
             clerkImportService.updateData(t);
             return;
         }
-
         ClerkDTO clerkDTO = new ClerkDTO();
+        // 判断code是否重复
+        TabClerk clerk = clerkService.getClerkByCode(t.getEnterpriseId(), t.getClerkCode(), store.getStoreInfoId());
+        if (clerk != null) {
+            if (t.getReplace()) {
+                //替换更新code重复的记录
+                clerkDTO.setClerkId(clerk.getClerkId());
+            } else {
+                t.setErrorMessage("门店code已经存在");
+                clerkImportService.updateData(t);
+                return;
+            }
+        }
+
         clerkDTO.setEnterpriseId(t.getEnterpriseId());
         clerkDTO.setStoreInfoId(store.getStoreInfoId());
         clerkDTO.setClerkName(t.getClerkName().trim());

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

@@ -117,6 +117,7 @@ public class StoreTaskServiceImpl extends AbstractTaskAllocationOperation implem
             } else {
                 t.setErrorMessage("门店code已经存在");
                 storeImportService.updateData(t);
+                return;
             }
         }
         storeDTO.setStoreCode(t.getStoreCode().trim());

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

@@ -117,7 +117,7 @@ public class ClerkImportController {
         if (file.getSize() > 0) {
             String fileName = file.getOriginalFilename();
             String uuId = request.getParameter("uuId");
-            String repeatStoreCodeConfig = request.getParameter("repeatStoreCodeConfig");
+            String repeatStoreCodeConfig = request.getParameter("repeatClerkCodeConfig");
             if (StringUtils.isBlank(repeatStoreCodeConfig)) {
                 repeatStoreCodeConfig = "0";
             }