认证修改

diagbotman-service/src/main/java/com/diagbot/client/UserServiceClient.java

@@ -28,6 +28,9 @@ public interface UserServiceClient {
 
     @PostMapping(value = "/user/getUserByOrgName")
     RespDTO<List<Long>> getUserByOrgName(@RequestBody String orgName);
+    
+    @PostMapping(value = "/userAuthentication/getAuthInfoCount")
+    RespDTO<List<Integer>> getAuthInfoCount(@RequestBody Long userId);
 
 }
 

diagbotman-service/src/main/java/com/diagbot/client/hystrix/UserServiceHystrix.java

@@ -38,4 +38,12 @@ public class UserServiceHystrix implements UserServiceClient {
         log.error("【hystrix】调用{}异常", "getUserByOrgName");
         return null;
     }
+
+	@Override
+	public RespDTO<List<Integer>> getAuthInfoCount(Long userId) {
+		log.error("【hystrix】调用{}异常", "getAuthInfoCount");
+		return null;
+	}
+    
+    
 }

diagbotman-service/src/main/java/com/diagbot/dto/EnShowOptionDTO.java

@@ -14,6 +14,16 @@ public class EnShowOptionDTO implements Serializable {
      */
     private static final long serialVersionUID = 1L;
     
+    /**
+     * 认证中数量
+     */
+    private Integer authIngCount;
+    
+    /**
+     * 认证被拒原因个数
+     */
+    private Integer authRejectCount;
+    
     /**
      * 订单数量
      */

diagbotman-service/src/main/java/com/diagbot/facade/OpenedProductsFacade.java

@@ -1,5 +1,14 @@
 package com.diagbot.facade;
 
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import com.diagbot.client.UserServiceClient;
 import com.diagbot.dto.EnShowOptionDTO;
 import com.diagbot.dto.GetConsoleOnTrialDTO;
 import com.diagbot.dto.GetConsoleOpenedDTO;
@@ -27,13 +36,6 @@ import com.diagbot.vo.ModifyOpeningTimeVO;
 import com.diagbot.vo.OpenUpOnTrialVO;
 import com.diagbot.vo.ProductServiceSaveVO;
 import com.diagbot.vo.StartAndendByUserIdVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 /**
  * @Description:已开通产品业务层
@@ -54,6 +56,8 @@ public class OpenedProductsFacade extends OpenedProductsServiceImpl {
     private OpenedProductsFacade openedProductsFacade;
     @Autowired
     private ProductOrderFacade productOrderFacade;
+    @Autowired
+    private UserServiceClient userServiceClient;
 
     public List<OpenedProducts> getByAppkeyAndSecretFac(Map map) {
         return this.getByAppkeyAndSecret(map);
@@ -179,6 +183,10 @@ public class OpenedProductsFacade extends OpenedProductsServiceImpl {
         enShowOptionDTO.setOrderAuthFailCount(productOrderFacade.getOrderAuthFailCount(userId));
         enShowOptionDTO.setOpenedCount(openedCount);
         enShowOptionDTO.setOnTrialCount(onTrialCount);
+        
+        List<Integer> list = userServiceClient.getAuthInfoCount(userId).data;
+        enShowOptionDTO.setAuthIngCount(list.get(0));
+        enShowOptionDTO.setAuthRejectCount(list.get(1));
 
         return enShowOptionDTO;
     }

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

@@ -22,8 +22,10 @@ import com.diagbot.vo.UserAuthenticationVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -246,4 +248,28 @@ public class UserAuthenticationFacade extends UserAuthenticationServiceImpl {
         waitAuthenDTO.setCount(count);
         return waitAuthenDTO;
     }
+    
+    public List<Integer> getAuthInfoCount(Long userId){
+    	List<Integer> ret = new ArrayList<>();
+    	Integer authIngCount = 0;
+    	Integer authRejectCount = 0;
+    	User user = userFacade.getById(userId);
+    	if(user.getAuthStatus()==2){
+    		authIngCount = 1;
+    	}else if(user.getAuthStatus()==0){
+    		 QueryWrapper<UserAuthentication> qw = new QueryWrapper<>();
+    	     qw.eq("user_id", userId).
+    	                eq("is_deleted", IsDeleteEnum.N.getKey()).
+    	                orderByDesc("gmt_create");
+    	     UserAuthentication userAuthentication = this.getOne(qw);
+    	     if(userAuthentication!=null&&userAuthentication.getIsReject()==0){
+    	    	 authRejectCount = 1;
+    	     }
+    	}
+    	
+    	ret.add(authIngCount);
+    	ret.add(authRejectCount);
+    
+    	return ret;
+    }
 }

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

@@ -11,6 +11,8 @@ import com.diagbot.facade.UserAuthenticationFacade;
 import com.diagbot.vo.UserAuthenticationVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import springfox.documentation.annotations.ApiIgnore;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -18,6 +20,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 import javax.validation.Valid;
 
 /**
@@ -93,5 +97,14 @@ public class UserAuthenticationController {
     public RespDTO<WaitAuthenDTO> waitAuthen() {
         return RespDTO.onSuc(userAuthenticationFacade.waitAuthen());
     }
+    
+    @PostMapping(value = "/getAuthInfoCount")
+    @SysLogger("getAuthInfoCount")
+    @ApiOperation(value = "远程调用，根据用户id获取用户认证信息[by:rgb]")
+    @ApiIgnore
+    RespDTO<List<Integer>> getAuthInfoCount(@RequestBody Long userId) {
+        List<Integer> data = userAuthenticationFacade.getAuthInfoCount(userId);
+        return RespDTO.onSuc(data);
+    }
 
 }