需求

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/workorder/OrderBaseLogic.java

@@ -138,13 +138,13 @@ public class OrderBaseLogic {
         //待接单
         // A 或 B 的条件
         BoolQueryBuilder orConditionAB = QueryBuilders.boolQuery()
-                .should(QueryBuilders.matchQuery("is_import_excel", false))
-                .should(QueryBuilders.matchQuery("order_status",  OrderBaseStatusEnum.DJD.getKey()));
+                .must(QueryBuilders.matchQuery("is_import_excel", false))
+                .must(QueryBuilders.matchQuery("order_status",  OrderBaseStatusEnum.DJD.getKey()));
 
         // C 或 D 的条件
         BoolQueryBuilder orConditionCD = QueryBuilders.boolQuery()
-                .should(QueryBuilders.matchQuery("is_import_excel", true))
-                .should(QueryBuilders.matchQuery("is_meet", false));
+                .must(QueryBuilders.matchQuery("is_import_excel", true))
+                .must(QueryBuilders.matchQuery("is_meet", false));
 
         NativeSearchQuery searchQueryDJD = new NativeSearchQueryBuilder()
                 .withQuery(boolQueryOrder)
@@ -643,13 +643,13 @@ public class OrderBaseLogic {
         if(StringUtils.equals(orderStatus, OrderBaseStatusEnum.DJD.getKey())) {
             // A 或 B 的条件
             BoolQueryBuilder orConditionAB = QueryBuilders.boolQuery()
-                    .should(QueryBuilders.matchQuery("is_import_excel", false))
-                    .should(QueryBuilders.matchQuery("order_status",  OrderBaseStatusEnum.DJD.getKey()));
+                    .must(QueryBuilders.matchQuery("is_import_excel", false))
+                    .must(QueryBuilders.matchQuery("order_status",  OrderBaseStatusEnum.DJD.getKey()));
 
             // C 或 D 的条件
             BoolQueryBuilder orConditionCD = QueryBuilders.boolQuery()
-                    .should(QueryBuilders.matchQuery("is_import_excel", true))
-                    .should(QueryBuilders.matchQuery("is_meet", false));
+                    .must(QueryBuilders.matchQuery("is_import_excel", true))
+                    .must(QueryBuilders.matchQuery("is_meet", false));
 
             boolQueryOrder
                     .should(orConditionAB).should(orConditionCD);