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

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

@@ -215,7 +215,16 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
      */
     public WaitExamOrderCouDTO waitExamOrderCou() {
         WaitExamOrderCouDTO waitExamOrderCouDTO = new WaitExamOrderCouDTO();
-        waitExamOrderCouDTO.setCount(baseMapper.waitExamOrderCou());
+        RespDTO<List<User>> userInfiList = userServiceClient.getUserAllInfo();
+        if(userInfiList == null || !"0".equals(userInfiList.code) ) {
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
+                    "获取用户和机构信息失败");
+        }
+        List<Long> userIds =new ArrayList<>();
+        for (User user:userInfiList.data) {
+            userIds.add(user.getId());
+        }
+        waitExamOrderCouDTO.setCount(baseMapper.waitExamOrderCou(userIds));
         return waitExamOrderCouDTO;
     }
 

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

@@ -69,7 +69,7 @@ public interface ProductOrderMapper extends BaseMapper<ProductOrder> {
      *
      * @return
      */
-    int waitExamOrderCou();
+    int waitExamOrderCou(List<Long> list);
 
     /**
      * @Description: 产品申请查询所有订单信息接口

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

@@ -86,13 +86,16 @@
         </if>
     </select>
 
-    <select id="waitExamOrderCou" resultType="int">
+    <select id="waitExamOrderCou" parameterType="list" resultType="int">
     	SELECT 
 			count(1) 
 		FROM diag_product_order a join
 		(SELECT DISTINCT order_num
 		from diag_order_details where is_deleted='N' and audit_status=2) b on a.num=b.order_num
-		where a.is_deleted='N'
+		where a.is_deleted='N' and a.user_id in
+		<foreach collection="list" open="(" close=")" separator="," item="userid">
+			#{userid}
+		</foreach>
     </select>
 
     <select id="selectAllProductOrder" resultMap="BaseResultWrapper">

gateway-service/src/main/java/com/diagbot/filter/GlobalGatewayFilter.java

@@ -92,8 +92,8 @@ public class GlobalGatewayFilter implements GlobalFilter {
 
         Map<String, Long> serviceFilters = this.dealServiceFilter();
         if (serviceFilters.get(serviceName) != null) {
-            String appkey = request.getHeaders().getFirst("appkey");
-            String secret = request.getHeaders().getFirst("secret");
+            String appkey = request.getHeaders().getFirst("appKeyId");
+            String secret = request.getHeaders().getFirst("appKeySecret");
             Long productId = SERVICE_FILTER.get(serviceName);
             //获取appkey，secret对应的权限信息
             ServiceToken st = new ServiceToken();