code review done。

src/main/java/cn/quantgroup/user/enums/ModifyPhoneNoApplyStatusEnum.java

@@ -28,24 +28,15 @@ public enum ModifyPhoneNoApplyStatusEnum {
     /**
      * 类型
      */
-    private int type;
+    private int ordinal;
 
     /**
      * 描述
      */
     private String desc;
 
-    ModifyPhoneNoApplyStatusEnum(int type, String desc) {
-        this.type = type;
+    ModifyPhoneNoApplyStatusEnum(int ordinal, String desc) {
+        this.ordinal = ordinal;
         this.desc = desc;
     }
-
-    public static String getDesc(int type) {
-        for (ModifyPhoneNoApplyStatusEnum modifyPhoneNoApplyStatusEnum : ModifyPhoneNoApplyStatusEnum.values()) {
-            if (modifyPhoneNoApplyStatusEnum.type == type) {
-                return modifyPhoneNoApplyStatusEnum.desc;
-            }
-        }
-        return null;
-    }
 }

src/main/java/cn/quantgroup/user/enums/ModifyPhoneNoProcessingStatusEnum.java

@@ -28,24 +28,15 @@ public enum ModifyPhoneNoProcessingStatusEnum {
     /**
      * 类型
      */
-    private int type;
+    private int ordinal;
 
     /**
      * 描述
      */
     private String desc;
 
-    ModifyPhoneNoProcessingStatusEnum(int type, String desc) {
-        this.type = type;
+    ModifyPhoneNoProcessingStatusEnum(int ordinal, String desc) {
+        this.ordinal = ordinal;
         this.desc = desc;
     }
-
-    public static String getDesc(int type) {
-        for (ModifyPhoneNoProcessingStatusEnum modifyPhoneNoProcessingStatusEnum : ModifyPhoneNoProcessingStatusEnum.values()) {
-            if (modifyPhoneNoProcessingStatusEnum.type == type) {
-                return modifyPhoneNoProcessingStatusEnum.desc;
-            }
-        }
-        return null;
-    }
 }

src/main/java/cn/quantgroup/xyqb/controller/modifyphoneno/ModifyPhoneNoController.java

@@ -7,9 +7,7 @@ import cn.quantgroup.xyqb.controller.modifyphoneno.req.Step1Req;
 import cn.quantgroup.xyqb.controller.modifyphoneno.req.Step2Req;
 import cn.quantgroup.xyqb.entity.ModifyPhoneNo;
 import cn.quantgroup.xyqb.entity.User;
-import cn.quantgroup.xyqb.exception.DataException;
 import cn.quantgroup.xyqb.model.JsonResult;
-import cn.quantgroup.xyqb.service.auth.IIdCardService;
 import cn.quantgroup.xyqb.service.user.IModifyPhoneNoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -18,7 +16,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
-import java.text.ParseException;
 
 /**
  * 用户手机号修改相关api
@@ -35,8 +32,6 @@ public class ModifyPhoneNoController implements IBaseController {
 
     @Resource
     private IModifyPhoneNoService modifyPhoneNoService;
-    @Resource
-    private IIdCardService iIdCardService;
 
     @ApiOperation("app - 查询用户手机号修改进度")
     @GetMapping("/progress")

src/main/java/cn/quantgroup/xyqb/service/user/impl/ModifyPhoneNoServiceImpl.java

@@ -94,8 +94,8 @@ public class ModifyPhoneNoServiceImpl implements IModifyPhoneNoService {
         modifyPhoneNo.setIdCardFaceUrl(step2Req.getIdCardFaceUrl());
         modifyPhoneNo.setIdCardRearUrl(step2Req.getIdCardRearUrl());
         modifyPhoneNo.setIdCardHoldUrl(step2Req.getIdCardHoldUrl());
-        modifyPhoneNo.setApplyStatus(ModifyPhoneNoApplyStatusEnum.INIT.getType());
-        modifyPhoneNo.setProcessingStatus(ModifyPhoneNoProcessingStatusEnum.INIT.getType());
+        modifyPhoneNo.setApplyStatus(ModifyPhoneNoApplyStatusEnum.INIT.getOrdinal());
+        modifyPhoneNo.setProcessingStatus(ModifyPhoneNoProcessingStatusEnum.INIT.getOrdinal());
     }
 
     /**
@@ -108,7 +108,7 @@ public class ModifyPhoneNoServiceImpl implements IModifyPhoneNoService {
      */
     @Override
     public Integer progress(Long userId) {
-        ModifyPhoneNo modifyPhoneNo = modifyPhoneNoRepository.findFirstByUserIdAndApplyStatus(userId, ModifyPhoneNoApplyStatusEnum.INIT.getType());
+        ModifyPhoneNo modifyPhoneNo = modifyPhoneNoRepository.findFirstByUserIdAndApplyStatus(userId, ModifyPhoneNoApplyStatusEnum.INIT.getOrdinal());
         if (modifyPhoneNo == null) {
             return 0;
         }
@@ -141,10 +141,10 @@ public class ModifyPhoneNoServiceImpl implements IModifyPhoneNoService {
                     list.add(criteriaBuilder.lessThanOrEqualTo(root.get("createdAt"), DateUtils.strToDate(modifyPhoneNoQueryReq.getEndAt(), DateUtils.YMD_FORMAT)));
                 }
                 if (modifyPhoneNoQueryReq.getApplyStatus() != null) {
-                    list.add(criteriaBuilder.equal(root.get("applyStatus"), modifyPhoneNoQueryReq.getApplyStatus().getType()));
+                    list.add(criteriaBuilder.equal(root.get("applyStatus"), modifyPhoneNoQueryReq.getApplyStatus().getOrdinal()));
                 }
                 if (modifyPhoneNoQueryReq.getProcessingStatus() != null) {
-                    list.add(criteriaBuilder.equal(root.get("processingStatus"), modifyPhoneNoQueryReq.getProcessingStatus().getType()));
+                    list.add(criteriaBuilder.equal(root.get("processingStatus"), modifyPhoneNoQueryReq.getProcessingStatus().getOrdinal()));
                 }
                 Predicate[] arr = new Predicate[list.size()];
                 return criteriaBuilder.and(list.toArray(arr));
@@ -180,7 +180,7 @@ public class ModifyPhoneNoServiceImpl implements IModifyPhoneNoService {
         if (modifyPhoneNo == null) {
             throw new DataException("数据不存在。");
         }
-        modifyPhoneNo.setProcessingStatus(ModifyPhoneNoProcessingStatusEnum.DONE.getType());
+        modifyPhoneNo.setProcessingStatus(ModifyPhoneNoProcessingStatusEnum.DONE.getOrdinal());
     }
 
     @Override
@@ -191,14 +191,14 @@ public class ModifyPhoneNoServiceImpl implements IModifyPhoneNoService {
             throw new DataException("数据不存在。");
         }
         if (ModifyPhoneNoApplyStatusEnum.NO_ALLOW == auditReq.getApplyStatus()) {
-            modifyPhoneNo.setApplyStatus(ModifyPhoneNoApplyStatusEnum.NO_ALLOW.getType());
+            modifyPhoneNo.setApplyStatus(ModifyPhoneNoApplyStatusEnum.NO_ALLOW.getOrdinal());
             modifyPhoneNo.setApplyStatusReason(auditReq.getApplyStatusReason());
         }
         if (ModifyPhoneNoApplyStatusEnum.DONE == auditReq.getApplyStatus()) {
             allowModify4Audit(modifyPhoneNo.getUserId(), modifyPhoneNo.getName(), modifyPhoneNo.getIdCard(),
                     modifyPhoneNo.getPrevPhoneNo(), modifyPhoneNo.getCurPhoneNo());
             userService.modifyPhoneNo(modifyPhoneNo.getPrevPhoneNo(), modifyPhoneNo.getCurPhoneNo());
-            modifyPhoneNo.setApplyStatus(ModifyPhoneNoApplyStatusEnum.DONE.getType());
+            modifyPhoneNo.setApplyStatus(ModifyPhoneNoApplyStatusEnum.DONE.getOrdinal());
         }
     }
 
@@ -220,7 +220,7 @@ public class ModifyPhoneNoServiceImpl implements IModifyPhoneNoService {
      * @return
      */
     public void allowModify4Step1(Long userId, String name, String idCard, String prevPhoneNo, String curPhoneNo, String smsCode) {
-        if (modifyPhoneNoRepository.findFirstByUserIdAndApplyStatus(userId, ModifyPhoneNoProcessingStatusEnum.INIT.getType()) != null) {
+        if (modifyPhoneNoRepository.findFirstByUserIdAndApplyStatus(userId, ModifyPhoneNoProcessingStatusEnum.INIT.getOrdinal()) != null) {
             throw new DataException("已存在处理中的申请单，不支持再次更换。");
         }
         if (!smsService.verifyPhoneAndCode(curPhoneNo, smsCode)) {