认证状态修改

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

@@ -13,7 +13,17 @@ public class EnShowOptionDTO implements Serializable {
      *
      */
     private static final long serialVersionUID = 1L;
+    
+    /**
+     * 订单数量
+     */
+    private Integer orderCount;
 
+    /**
+     * 订单审核不通过订单数
+     */
+    private Integer orderAuthFailCount;
+    
     /**
      * 可开通产品数量
      */
@@ -23,5 +33,7 @@ public class EnShowOptionDTO implements Serializable {
      * 可试用产品数量
      */
     private Integer onTrialCount;
+    
+    
 
 }

diagbotman-service/src/main/java/com/diagbot/mapper/ProductOrderMapper.java

@@ -26,7 +26,7 @@ public interface ProductOrderMapper extends BaseMapper<ProductOrder> {
      * @Date: 19:39 2018/9/20
      */
     List<ProductOrder> getUserProductOrder(Long userId);
-
+    
     /**
      * 根据订单号查询详情
      *

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

@@ -23,6 +23,10 @@ public class QueryAuthProgressDTO implements Serializable {
     
     private String userStatusMsg;//用户认证状态信息
 
+    private Integer isReject;//是否通过认证 0:未通过，1:已通过
+    
+    private String rejectType;//未通过类型
+    
     private String rejectComment;//认证被拒理由
 
 }

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

@@ -8,6 +8,7 @@ import com.diagbot.dto.WaitAuthenDTO;
 import com.diagbot.entity.Organization;
 import com.diagbot.entity.User;
 import com.diagbot.entity.UserAuthentication;
+import com.diagbot.enums.AccdenEnum;
 import com.diagbot.enums.AuthHandleEnum;
 import com.diagbot.enums.AuthStatusEnum;
 import com.diagbot.enums.IsDeleteEnum;
@@ -194,7 +195,14 @@ public class UserAuthenticationFacade extends UserAuthenticationServiceImpl {
         QueryAuthProgressDTO queryAuthProgressDTO = new QueryAuthProgressDTO();
         queryAuthProgressDTO.setUserStatus(user.getAuthStatus());
         queryAuthProgressDTO.setUserStatusMsg(AuthStatusEnum.getName(user.getAuthStatus()));
-        queryAuthProgressDTO.setRejectComment(userAuthentication.getRejectComment());
+        if(userAuthentication!=null){
+        	queryAuthProgressDTO.setIsReject(userAuthentication.getIsReject());
+        	if(userAuthentication.getRejectType()!=null){
+        		queryAuthProgressDTO.setRejectType(AccdenEnum.getName(userAuthentication.getRejectType()));
+        	}
+        	queryAuthProgressDTO.setRejectComment(userAuthentication.getRejectComment());
+        }
+        
 
         return queryAuthProgressDTO;
     }