Merge remote-tracking branch 'origin/dev/one' into dev/one

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

@@ -52,6 +52,8 @@ public class OpenedProductsFacade extends OpenedProductsServiceImpl {
     private LantoneProductFacade lantoneProductFacade;
     @Autowired
     private OpenedProductsFacade openedProductsFacade;
+    @Autowired
+    private ProductOrderFacade productOrderFacade;
 
     public List<OpenedProducts> getByAppkeyAndSecretFac(Map map) {
         return this.getByAppkeyAndSecret(map);
@@ -173,6 +175,8 @@ public class OpenedProductsFacade extends OpenedProductsServiceImpl {
         int onTrialCount = baseMapper.getConsoleOnTrialCount(userId);
 
         EnShowOptionDTO enShowOptionDTO = new EnShowOptionDTO();
+        enShowOptionDTO.setOrderCount(productOrderFacade.getUserProductOrderCount(userId));
+        enShowOptionDTO.setOrderAuthFailCount(productOrderFacade.getOrderAuthFailCount(userId));
         enShowOptionDTO.setOpenedCount(openedCount);
         enShowOptionDTO.setOnTrialCount(onTrialCount);
 

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

@@ -106,6 +106,24 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
 
         return retList;
     }
+    
+    /**
+     * 根据用户id查询订单信息数量
+     * @param userId
+     * @return
+     */
+    public int getUserProductOrderCount(Long userId){
+    	return baseMapper.getUserProductOrderCount(userId);
+    }
+    
+    /**
+     * 根据用户id查询审核不通过订单信息数量
+     * @param userId
+     * @return
+     */
+    public int getOrderAuthFailCount(Long userId){
+    	return baseMapper.getOrderAuthFailCount(userId);
+    }
 
 
     /**

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

@@ -27,6 +27,13 @@ public interface ProductOrderMapper extends BaseMapper<ProductOrder> {
      */
     List<ProductOrder> getUserProductOrder(Long userId);
     
+    /**
+     * 根据用户id查询订单信息数量
+     * @param userId
+     * @return
+     */
+    int getUserProductOrderCount(Long userId);
+    
     /**
      * 根据订单号查询详情
      *
@@ -42,6 +49,13 @@ public interface ProductOrderMapper extends BaseMapper<ProductOrder> {
      * @return
      */
     List<AuthDetailDTO> getOrderDetailsByNums(List<String> nums);
+    
+    /**
+     * 根据用户id查询审核不通过订单信息数量
+     * @param userId
+     * @return
+     */
+    int getOrderAuthFailCount(Long userId);
 
     /**
      * @Description: 根据订单号查询订单信息

diagbotman-service/src/main/resources/mapper/OpenedProductsMapper.xml

@@ -65,8 +65,8 @@
 			b.access_type as accessType,
 			case when c.id is null then 0 else 1 end as renewalsStutas
 		from diag_opened_products a join diag_lantone_product b on a.product_id=b.id
-		left join diag_user_renewals c on a.user_id=c.user_id and a.product_id=c.product_id and c.renewals_status=0 and c.cancel_renewals=0
-		where a.is_deleted='N' and b.is_deleted='N' and a.user_id=#{userId};
+		left join diag_user_renewals c on a.user_id=c.user_id and a.product_id=c.product_id and c.renewals_status=0 and c.cancel_renewals=0 and c.is_deleted='N'
+		where a.is_deleted='N' and b.is_deleted='N' and a.user_id=#{userId}
     </select>
 
     <select id="getConsoleOpenedCount" parameterType="long" resultType="int">
@@ -135,7 +135,7 @@
 		FROM
 		diag_opened_products
 		WHERE
-		user_id = #{userId})
+		user_id = #{userId} and is_deleted = 'N' and service_status = 1)
     </select>
     <select id="getInformationAvailableByUserId" parameterType="com.diagbot.entity.OpenedProducts"
             resultType="com.diagbot.dto.UserAndProdutDTO">

diagbotman-service/src/main/resources/mapper/ProductOrderMapper.xml

@@ -36,6 +36,12 @@
     	from diag_product_order
     	where is_deleted = 'N' and user_id=#{userId}
     </select>
+    
+    <select id="getUserProductOrderCount" parameterType="Long" resultType="int">
+    	select count(distinct a.num)
+		from diag_product_order a join diag_order_details b on a.num=b.order_num
+		where a.is_deleted = 'N' and b.is_deleted='N' and a.user_id=#{userId}
+    </select>
 
     <select id="getOrderDetails" parameterType="string" resultType="com.diagbot.dto.AuthDetailDTO">
 		select
@@ -63,6 +69,14 @@
             #{num}
         </foreach>
     </select>
+    
+    <select id="getOrderAuthFailCount" parameterType="Long" resultType="int">
+    	select count(distinct a.num)
+		from diag_product_order a
+		join diag_order_details b on a.num=b.order_num
+		join diag_lantone_product c on b.product_id=c.id
+		where a.is_deleted = 'N' and b.is_deleted = 'N' and c.is_deleted = 'N' and b.audit_status='0' and a.user_id=#{userId}
+    </select>
 
     <select id="selctOrderTimeByOrderNum" resultMap="BaseResultMap"
             parameterType="com.diagbot.entity.ProductOrder">

user-service/src/main/resources/mapper/UserAuthenticationMapper.xml

@@ -24,8 +24,8 @@
     <select id="getAllWaitAuthCou" resultType="int">
     	select
     		count(1)
-    	from sys_user_authentication
-    	where is_deleted = 'N' and status=2
+    	from sys_user
+    	where is_deleted = 'N' and auth_status=2
     </select>
 
 </mapper>

user-service/src/main/resources/mapper/UserMapper.xml

@@ -246,14 +246,14 @@
             <if test="auditMap.certificationDate != null">a.certification_date = #{auditMap.certificationDate},</if>
             <if test="auditMap.rejectType != null">a.reject_type =#{auditMap.rejectType},</if>
             <if test="auditMap.rejectComment != null">a.reject_comment= #{auditMap.rejectComment},</if>
-            <if test="auditMap.status != null">a.STATUS= #{auditMap.status}</if>
-            <if test="auditMap.authStatus != null">u.auth_status = #{auditMap.authStatus}</if>
-            <if test="auditMap.passauthTime != null">u.passauth_time = #{auditMap.passauthTime},</if>
+            <if test="auditMap.status != null">a.STATUS= #{auditMap.status},</if>
+            <if test="auditMap.authStatus != null">u.auth_status = #{auditMap.authStatus},</if>
+            <if test="auditMap.certificationDate != null">u.passauth_time = #{auditMap.certificationDate},</if>
             <if test="auditMap.gmtModified !=null">u.gmt_modified=#{auditMap.gmtModified},</if>
-            <if test="auditMap.modifier != null">u.modifier=#{auditMap.modifier},</if>
+            <if test="auditMap.modifier != null">u.modifier=#{auditMap.modifier}</if>
         </trim>
         WHERE
-        is_deleted = "N"
+        a.is_deleted = "N"
         AND a.user_id = #{auditMap.userId}
         AND a.order_num = #{auditMap.orderNum}
         AND u.id = #{auditMap.userId}
@@ -440,8 +440,13 @@
 	JOIN sys_user u ON u.id = aut.user_id
 	JOIN sys_user_organization uorg ON u.id = uorg.user_id
 	JOIN sys_organization org ON uorg.organization_id = org.id
-	WHERE u.is_deleted = 'N' AND aut.is_deleted = 'N' AND u.TYPE = 0 AND
-	aut.status = 0
+	WHERE u.is_deleted = 'N' AND aut.is_deleted = 'N' AND u.TYPE = 0 
+	<if test="authen.status != null">
+	    AND aut.status = #{authen.status}
+	</if>     
+	<if test="authen.authStatus != null">
+	    AND u.auth_status= #{authen.authStatus}
+	</if>
 	<if test="authen.orgName != null">
 		AND org.name LIKE CONCAT('%', #{authen.orgName}, '%')
 	</if>
@@ -570,8 +575,13 @@
 	JOIN sys_user u ON u.id = aut.user_id
 	JOIN sys_user_organization uorg ON u.id = uorg.user_id
 	JOIN sys_organization org ON uorg.organization_id = org.id
-	WHERE u.is_deleted = 'N' AND aut.is_deleted = 'N' AND u.TYPE = 0 AND
-	aut.status = 0
+	WHERE u.is_deleted = 'N' AND aut.is_deleted = 'N' AND u.TYPE = 0 
+	<if test="exportKema.status != null">
+	    AND aut.status = #{exportKema.status}
+	</if>     
+	<if test="exportKema.authStatus != null">
+	    AND u.auth_status= #{exportKema.authStatus}
+	</if>
 	<if test="exportKema.orgName != null">
 		AND org.name LIKE CONCAT('%', #{exportKema.orgName}, '%')
 	</if>
@@ -584,4 +594,4 @@
 
 	ORDER BY aut.gmt_create DESC
 	</select>
-</mapper>
+</mapper>