app - 查询用户手机号修改进度 DONE.

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

@@ -32,13 +32,24 @@ public class ModifyPhoneNoController implements IBaseController {
     @Resource
     private IModifyPhoneNoService modifyPhoneNoService;
 
+    @ApiOperation("app - 查询用户手机号修改进度")
+    @GetMapping("/progress")
+    public JsonResult progress() {
+        User user = getCurrentUserFromRedis();
+        if (user == null) {
+            return JsonResult.buildErrorStateResult("系统错误", null);
+        }
+        return JsonResult.buildSuccessResult(modifyPhoneNoService.progress(user.getId()));
+    }
+
+
     /**
      * step_1
      *
      * @param step1Req
      * @return
      */
-    @ApiOperation("step_1")
+    @ApiOperation("app - 申请修改手机号Step_1")
     @PostMapping("/step_1")
     public JsonResult step1(@Valid @RequestBody Step1Req step1Req) {
         User user = getCurrentUserFromRedis();
@@ -54,7 +65,7 @@ public class ModifyPhoneNoController implements IBaseController {
      * @param step2Req
      * @return
      */
-    @ApiOperation("step_2")
+    @ApiOperation("app - 申请修改手机号Step_2")
     @PostMapping("/step_2")
     public JsonResult step2(@Valid @RequestBody Step2Req step2Req) {
         modifyPhoneNoService.saveStep2(step2Req);

src/main/java/cn/quantgroup/xyqb/service/user/IModifyPhoneNoService.java

@@ -20,4 +20,6 @@ public interface IModifyPhoneNoService {
      *
      */
     void saveStep2(Step2Req step2Req);
+
+    Integer progress(Long id);
 }

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

@@ -12,6 +12,7 @@ import cn.quantgroup.xyqb.repository.IUserDetailRepository;
 import cn.quantgroup.xyqb.service.sms.ISmsService;
 import cn.quantgroup.xyqb.service.user.IModifyPhoneNoService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -73,6 +74,29 @@ public class ModifyPhoneNoServiceImpl implements IModifyPhoneNoService {
         modifyPhoneNo.setProcessingStatus(ModifyPhoneNoProcessingStatusEnum.INIT.getType());
     }
 
+    /**
+     * 查询用户手机号修改进度
+     *
+     * @param id user.id
+     * @return 进度 0初始化（用户未填写过申请单或提交过的申请单均已处理完成且反馈）;
+     * 1已填写基本信息，未上传身份证图片;
+     * 2已填写基本信息，且已上传身份证图片
+     */
+    @Override
+    public Integer progress(Long id) {
+        ModifyPhoneNo modifyPhoneNo = modifyPhoneNoRepository.findFirstByUserIdAndProcessingStatusNot(id, ModifyPhoneNoProcessingStatusEnum.DONE.getType());
+        if (modifyPhoneNo == null) {
+            return 0;
+        }
+        if (StringUtils.isBlank(modifyPhoneNo.getIdCardFaceUrl()) && StringUtils.isBlank(modifyPhoneNo.getIdCardRearUrl()) && StringUtils.isBlank(modifyPhoneNo.getIdCardHoldUrl())) {
+            return 1;
+        }
+        if (StringUtils.isNotBlank(modifyPhoneNo.getIdCardFaceUrl()) && StringUtils.isNotBlank(modifyPhoneNo.getIdCardRearUrl()) && StringUtils.isNotBlank(modifyPhoneNo.getIdCardHoldUrl())) {
+            return 2;
+        }
+        return -1;
+    }
+
     /**
      * 验证用户是否允许修改手机号
      * <p>