用户认证进度

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

@@ -0,0 +1,19 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description: 用户认证进度输出类
+ * @author: rgb
+ * @time: 2018/8/2 14:22
+ */
+@Getter
+@Setter
+public class QueryAuthProgressDTO {
+   
+	private String status;
+	
+	private String statusMessage;
+	
+}

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

@@ -1,5 +1,14 @@
 package com.diagbot.facade;
 
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import com.diagbot.dto.QueryAuthProgressDTO;
 import com.diagbot.dto.UserAuthenticationDTO;
 import com.diagbot.dto.UserAuthenticationRespDTO;
 import com.diagbot.entity.Organization;
@@ -10,12 +19,6 @@ import com.diagbot.enums.OrganizationTypeEnum;
 import com.diagbot.service.impl.UserAuthenticationServiceImpl;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.UserAuthenticationVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  * @Description:用户认证业务层
@@ -143,4 +146,32 @@ public class UserAuthenticationFacade extends UserAuthenticationServiceImpl {
         }
         return map;
     }
+    
+    public QueryAuthProgressDTO queryAuthProgress() {
+    	QueryAuthProgressDTO queryAuthProgressDTO = new QueryAuthProgressDTO();
+        Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
+        UserAuthentication userAuthentication = this.getByUserId(userId);
+        String status = userAuthentication.getStatus();
+        String isReject = userAuthentication.getIsReject();
+        if(StringUtils.isBlank(isReject)){
+        	if(status.equals("0")){
+        		queryAuthProgressDTO.setStatus("1");
+        		queryAuthProgressDTO.setStatusMessage("未认证");
+        	}else if(status.equals("2")){
+        		queryAuthProgressDTO.setStatus("2");
+        		queryAuthProgressDTO.setStatusMessage("认证中");
+        	}
+        }else if(isReject.equals("N")){
+        	if(status.equals("0")){
+        		queryAuthProgressDTO.setStatus("3");
+        		queryAuthProgressDTO.setStatusMessage("认证未通过");
+        	}
+        }else if(isReject.equals("Y")){
+          	if(status.equals("1")){
+        		queryAuthProgressDTO.setStatus("4");
+        		queryAuthProgressDTO.setStatusMessage("认证通过");
+        	}
+        }
+        return queryAuthProgressDTO;
+    }
 }

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

@@ -1,24 +1,26 @@
 package com.diagbot.web;
 
 
+import java.util.Map;
+
+import javax.validation.Valid;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.QueryAuthProgressDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.UserAuthenticationDTO;
 import com.diagbot.dto.UserAuthenticationRespDTO;
-import com.diagbot.entity.UserAuthentication;
 import com.diagbot.facade.UserAuthenticationFacade;
 import com.diagbot.vo.UserAuthenticationVO;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.validation.Valid;
-import java.util.Map;
 
 /**
  * <p>
@@ -61,4 +63,12 @@ public class UserAuthenticationController {
         Map<String, Object> map = userAuthenticationFacade.getUserAuthenticationStatus();
         return RespDTO.onSuc(map);
     }
+    
+	 @ApiOperation(value = "当前用户认证进度")
+	 @PostMapping("/queryAuthProgress")
+	 @SysLogger("queryAuthProgress")
+	 public RespDTO<QueryAuthProgressDTO> queryAuthProgress() {
+		 return RespDTO.onSuc(userAuthenticationFacade.queryAuthProgress());
+	 }
+    
 }