批处理导购：性别为空，但是标记导入

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

@@ -15,9 +15,10 @@ public enum ImportClerkBatchResultEnum {
     C1("C1", "导购", "标记不导入", "导购code", "导购code为空"),
     C2("C2", "导购", "标记不导入", "导购code", "导购code重复"),
     C3("C3", "导购", "标记不导入", "导购名称", "导购名称为空"),
-    D1("D1", "导购属性", "标记不导入", "性别", "导购性别非法"),
-    D2("D2", "导购属性", "标记不导入", "手机号", "导购手机号重复"),
-    D3("D3", "导购属性", "标记不导入", "手机号", "导购手机号为空"),
+    D1("D1", "导购属性", "标记导入", "性别", "导购性别为空"),
+    D2("D2", "导购属性", "标记不导入", "性别", "导购性别错误"),
+    D3("D3", "导购属性", "标记不导入", "手机号", "导购手机号重复"),
+    D4("D4", "导购属性", "标记不导入", "手机号", "导购手机号为空"),
     E1("E1", "商户信息", "标记不导入", "商户", "商户ID非法");
 
     /**

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

@@ -357,21 +357,25 @@ public class ClerkApiServiceImpl implements ClerkApiService {
             nationcode = Constants.NATION_CODE;
         }
         Integer gender = clerkInfo.getClerkGender();
-        if (gender == null || (gender.intValue() != 1 && gender.intValue() != 2)) {
-            return responseErrorElement(ImportClerkBatchResultEnum.D1);
+        if (gender != null && gender.intValue() != 1 && gender.intValue() != 2) {
+            return responseErrorElement(ImportClerkBatchResultEnum.D2);
         }
         String phone = clerkInfo.getPhoneNumber();
         if (StringUtils.isBlank(phone)) {
-            return responseErrorElement(ImportClerkBatchResultEnum.D3);
+            return responseErrorElement(ImportClerkBatchResultEnum.D4);
         }
         if (clerkService.isRepeatByPhoneNumber(storeInfoId, phone, null, nationcode)) {
-            return responseErrorElement(ImportClerkBatchResultEnum.D2);
+            return responseErrorElement(ImportClerkBatchResultEnum.D3);
         }
         ClerkDTO clerkDTO = EntityUtil.changeEntityNew(ClerkDTO.class, clerkInfo);
         Integer id = clerkService.save(clerkDTO);
         clerkLogService.saveClerkLogBySaveClerk(enterpriseId, id, clerkDTO.getReason(),
                 clerkDTO.getRemark(), clerkDTO.getOperatorId(), clerkDTO.getOperatorName());
         storeLogByAddClerk(clerkDTO);
+        //性别为空，但是标记导入
+        if (gender == null) {
+            return responseErrorElement(ImportClerkBatchResultEnum.D1);
+        }
         return ServiceResponse.success(id.toString());
     }