Merge branch 'feature_modify_phone_no' of...

Merge branch 'feature_modify_phone_no' of git.quantgroup.cn:head_group/xyqb-user2 into feature_modify_phone_no

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

@@ -15,28 +15,22 @@ public enum ModifyPhoneNoApplyStatusEnum {
     /**
      * 处理中
      */
-    INIT(0, "处理中"),
+    INIT("处理中"),
     /**
      * 修改完成
      */
-    DONE(1, "修改完成"),
+    DONE("修改完成"),
     /**
      * 不允许修改
      */
-    NO_ALLOW(2, "不允许修改");
-
-    /**
-     * 类型
-     */
-    private int ordinal;
+    NO_ALLOW("不允许修改");
 
     /**
      * 描述
      */
     private String desc;
 
-    ModifyPhoneNoApplyStatusEnum(int ordinal, String desc) {
-        this.ordinal = ordinal;
+    ModifyPhoneNoApplyStatusEnum(String desc) {
         this.desc = desc;
     }
 }

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

@@ -15,28 +15,22 @@ public enum ModifyPhoneNoProcessingStatusEnum {
     /**
      * 待人工处理
      */
-    INIT(0, "待人工处理"),
+    INIT("待人工处理"),
     /**
      * 待用户反馈
      */
-    WAIT_4_USER_FEEDBACK(1, "待用户反馈"),
+    WAIT_4_USER_FEEDBACK("待用户反馈"),
     /**
      * 已反馈
      */
-    DONE(2, "已反馈");
-
-    /**
-     * 类型
-     */
-    private int ordinal;
+    DONE("已反馈");
 
     /**
      * 描述
      */
     private String desc;
 
-    ModifyPhoneNoProcessingStatusEnum(int ordinal, String desc) {
-        this.ordinal = ordinal;
+    ModifyPhoneNoProcessingStatusEnum(String desc) {
         this.desc = desc;
     }
 }

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.getOrdinal());
-        modifyPhoneNo.setProcessingStatus(ModifyPhoneNoProcessingStatusEnum.INIT.getOrdinal());
+        modifyPhoneNo.setApplyStatus(ModifyPhoneNoApplyStatusEnum.INIT.ordinal());
+        modifyPhoneNo.setProcessingStatus(ModifyPhoneNoProcessingStatusEnum.INIT.ordinal());
     }
 
     /**
@@ -108,7 +108,7 @@ public class ModifyPhoneNoServiceImpl implements IModifyPhoneNoService {
      */
     @Override
     public Integer progress(Long userId) {
-        ModifyPhoneNo modifyPhoneNo = modifyPhoneNoRepository.findFirstByUserIdAndApplyStatus(userId, ModifyPhoneNoApplyStatusEnum.INIT.getOrdinal());
+        ModifyPhoneNo modifyPhoneNo = modifyPhoneNoRepository.findFirstByUserIdAndApplyStatus(userId, ModifyPhoneNoApplyStatusEnum.INIT.ordinal());
         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().getOrdinal()));
+                    list.add(criteriaBuilder.equal(root.get("applyStatus"), modifyPhoneNoQueryReq.getApplyStatus().ordinal()));
                 }
                 if (modifyPhoneNoQueryReq.getProcessingStatus() != null) {
-                    list.add(criteriaBuilder.equal(root.get("processingStatus"), modifyPhoneNoQueryReq.getProcessingStatus().getOrdinal()));
+                    list.add(criteriaBuilder.equal(root.get("processingStatus"), modifyPhoneNoQueryReq.getProcessingStatus().ordinal()));
                 }
                 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.getOrdinal());
+        modifyPhoneNo.setProcessingStatus(ModifyPhoneNoProcessingStatusEnum.DONE.ordinal());
     }
 
     @Override
@@ -191,14 +191,14 @@ public class ModifyPhoneNoServiceImpl implements IModifyPhoneNoService {
             throw new DataException("数据不存在。");
         }
         if (ModifyPhoneNoApplyStatusEnum.NO_ALLOW == auditReq.getApplyStatus()) {
-            modifyPhoneNo.setApplyStatus(ModifyPhoneNoApplyStatusEnum.NO_ALLOW.getOrdinal());
+            modifyPhoneNo.setApplyStatus(ModifyPhoneNoApplyStatusEnum.NO_ALLOW.ordinal());
             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.getOrdinal());
+            modifyPhoneNo.setApplyStatus(ModifyPhoneNoApplyStatusEnum.DONE.ordinal());
         }
     }
 
@@ -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.getOrdinal()) != null) {
+        if (modifyPhoneNoRepository.findFirstByUserIdAndApplyStatus(userId, ModifyPhoneNoProcessingStatusEnum.INIT.ordinal()) != null) {
             throw new DataException("已存在处理中的申请单，不支持再次更换。");
         }
         if (!smsService.verifyPhoneAndCode(curPhoneNo, smsCode)) {