导购店长

gic-store-api/src/main/java/com/gic/store/constant/ImportClerkBatchResultEnum.java

@@ -19,6 +19,7 @@ public enum ImportClerkBatchResultEnum {
     D2("D2", "导购属性", "标记不导入", "性别", "导购性别错误"),
     D3("D3", "导购属性", "标记不导入", "手机号", "导购手机号重复"),
     D4("D4", "导购属性", "标记不导入", "手机号", "导购手机号为空"),
+    D5("D5", "导购属性", "标记不导入", "店长", "是否店长字段为空"),
     E1("E1", "商户信息", "标记不导入", "商户", "商户ID非法");
 
     /**

gic-store-api/src/main/java/com/gic/store/dto/clerk/ProcessBatchClerkDTO.java

@@ -62,6 +62,7 @@ public class ProcessBatchClerkDTO implements Serializable{
      */
     private Integer regionId;
 
+    private Integer clerkType;
     /********************操作日志**********************/
     /**
      * 事由   1:web后台操作   2:外部触发   3:订单同步  4:会员同步  5:系统配置触发 6 etl同步
@@ -192,4 +193,12 @@ public class ProcessBatchClerkDTO implements Serializable{
     public void setOperatorName(String operatorName) {
         this.operatorName = operatorName;
     }
+
+    public Integer getClerkType() {
+        return clerkType;
+    }
+
+    public void setClerkType(Integer clerkType) {
+        this.clerkType = clerkType;
+    }
 }

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

@@ -472,22 +472,28 @@ public class ClerkApiServiceImpl implements ClerkApiService {
         if (StringUtils.isBlank(phone)) {
             return responseErrorElement(ImportClerkBatchResultEnum.D4);
         }
+        if (clerkInfo.getClerkType() == null) {
+            return responseErrorElement(ImportClerkBatchResultEnum.D5);
+        }
         if (clerkService.isRepeatByPhoneNumber(storeInfoId, phone, null, nationcode)) {
             return responseErrorElement(ImportClerkBatchResultEnum.D3);
         }
         ClerkDTO clerkDTO = EntityUtil.changeEntityNew(ClerkDTO.class, clerkInfo);
         clerkDTO.setStoreInfoId(storeInfoId);
         clerkDTO.setStoreName(storeDTO.getStoreName());
-        Integer id;
+
+        ServiceResponse serviceResponse = saveOrUpdate(clerkDTO);
+        if (!serviceResponse.isSuccess()) {
+            return serviceResponse;
+        }
+        Integer id = (Integer) serviceResponse.getResult();
         if (isAdd) {
-            id = clerkService.save(clerkDTO);
             clerkLogService.saveClerkLogBySaveClerk(enterpriseId, id, clerkDTO.getReason(),
                     clerkDTO.getRemark(), clerkDTO.getOperatorId(), clerkDTO.getOperatorName());
             storeLogByAddClerk(clerkDTO);
         } else {
             id = clerk.getClerkId();
             clerkDTO.setClerkId(id);
-            clerkService.update(clerkDTO);
             clerkLogService.saveClerkLogByUpdateClerk(clerk, clerkDTO, clerkDTO.getEnterpriseId(),
                     clerkDTO.getClerkId(), clerkDTO.getReason(), clerkDTO.getRemark(), clerkDTO.getOperatorId(),
                     clerkDTO.getOperatorName());