控制台-账户认证进度修改

user-service/src/main/java/com/diagbot/dto/QueryAuthProgressDTO.java

@@ -12,8 +12,10 @@ import lombok.Setter;
 @Setter
 public class QueryAuthProgressDTO {
    
-	private String status;
+	private Integer status;
 	
-	private String statusMessage;
+	private String isReject;
+	
+	private String rejectComment;
 	
 }

user-service/src/main/java/com/diagbot/facade/UserAuthenticationFacade.java

@@ -150,30 +150,15 @@ public class UserAuthenticationFacade extends UserAuthenticationServiceImpl {
     }
 
     public QueryAuthProgressDTO queryAuthProgress() {
-        QueryAuthProgressDTO queryAuthProgressDTO = new QueryAuthProgressDTO();
         Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
         UserAuthentication userAuthentication = this.getByUserId(userId);
-        Integer status = userAuthentication.getStatus();
-        String isReject = userAuthentication.getIsReject();
-        if (StringUtils.isBlank(isReject)) {
-            if (status == 0) {
-                queryAuthProgressDTO.setStatus("1");
-                queryAuthProgressDTO.setStatusMessage("未认证");
-            } else if (status == 2) {
-                queryAuthProgressDTO.setStatus("2");
-                queryAuthProgressDTO.setStatusMessage("认证中");
-            }
-        } else if (isReject.equals("N")) {
-            if (status == 0) {
-                queryAuthProgressDTO.setStatus("3");
-                queryAuthProgressDTO.setStatusMessage("认证未通过");
-            }
-        } else if (isReject.equals("Y")) {
-            if (status == 1) {
-                queryAuthProgressDTO.setStatus("4");
-                queryAuthProgressDTO.setStatusMessage("认证通过");
-            }
-        }
+        
+        QueryAuthProgressDTO queryAuthProgressDTO = new QueryAuthProgressDTO();
+        queryAuthProgressDTO.setStatus(userAuthentication.getStatus());
+        queryAuthProgressDTO.setIsReject(userAuthentication.getIsReject());
+        queryAuthProgressDTO.setRejectComment(userAuthentication.getRejectComment());
+        
         return queryAuthProgressDTO;
     }
+    
 }

user-service/src/main/java/com/diagbot/web/UserAuthenticationController.java

@@ -64,11 +64,11 @@ public class UserAuthenticationController {
         return RespDTO.onSuc(map);
     }
     
-	 @ApiOperation(value = "当前用户认证进度")
-	 @PostMapping("/queryAuthProgress")
-	 @SysLogger("queryAuthProgress")
-	 public RespDTO<QueryAuthProgressDTO> queryAuthProgress() {
-		 return RespDTO.onSuc(userAuthenticationFacade.queryAuthProgress());
-	 }
+	@ApiOperation(value = "控制台-账号认证进度",notes="控制台-账号认证进度")
+	@PostMapping("/queryAuthProgress")
+	@SysLogger("queryAuthProgress")
+	public RespDTO<QueryAuthProgressDTO> queryAuthProgress() {
+		return RespDTO.onSuc(userAuthenticationFacade.queryAuthProgress());
+	}
     
 }