etl批处理导购修改：如果代购code存在，则进行更新操作

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

@@ -347,8 +347,12 @@ public class ClerkApiServiceImpl implements ClerkApiService {
             return responseErrorElement(ImportClerkBatchResultEnum.C1);
         }
         TabClerk clerk = this.clerkService.getClerkByCode(enterpriseId, clerkCode, storeInfoId);
+        boolean isAdd = true;
+        //如果代购code存在，则进行更新操作
         if (clerk != null) {
-            return responseErrorElement(ImportClerkBatchResultEnum.C2);
+            //return responseErrorElement(ImportClerkBatchResultEnum.C2);
+            isAdd = false;
+
         }
         if (StringUtils.isBlank(clerkInfo.getClerkName())) {
             return responseErrorElement(ImportClerkBatchResultEnum.C3);
@@ -371,10 +375,18 @@ public class ClerkApiServiceImpl implements ClerkApiService {
         ClerkDTO clerkDTO = EntityUtil.changeEntityNew(ClerkDTO.class, clerkInfo);
         clerkDTO.setStoreInfoId(storeInfoId);
         clerkDTO.setStoreName(storeDTO.getStoreName());
-        Integer id = clerkService.save(clerkDTO);
-        clerkLogService.saveClerkLogBySaveClerk(enterpriseId, id, clerkDTO.getReason(),
-                clerkDTO.getRemark(), clerkDTO.getOperatorId(), clerkDTO.getOperatorName());
-        storeLogByAddClerk(clerkDTO);
+        Integer id;
+        if (isAdd) {
+            id = clerkService.save(clerkDTO);
+            clerkLogService.saveClerkLogBySaveClerk(enterpriseId, id, clerkDTO.getReason(),
+                    clerkDTO.getRemark(), clerkDTO.getOperatorId(), clerkDTO.getOperatorName());
+            storeLogByAddClerk(clerkDTO);
+        } else {
+            id = clerk.getClerkId();
+            clerkLogService.saveClerkLogByUpdateClerk(clerk, clerkDTO, clerkDTO.getEnterpriseId(),
+                    clerkDTO.getClerkId(), clerkDTO.getReason(), clerkDTO.getRemark(), clerkDTO.getOperatorId(),
+                    clerkDTO.getOperatorName());
+        }
         //性别为空，但是标记导入
         if (gender == null) {
             return responseErrorElement(ImportClerkBatchResultEnum.D1);