no message

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderBaseEsLogic.java

@@ -3,7 +3,6 @@ package com.gree.mall.manager.logic.workorder;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
@@ -460,35 +459,6 @@ public class OrderBaseEsLogic {
         dyy.put("orderStatus", "DYY");
         maps.add(dyy);
 
-        // 当日需处理（8:00-17:59创建，create_time后移半小时内appointment_time为空）
-        NativeSearchQuery drxcSearchQuery = new NativeSearchQueryBuilder()
-                .withQuery(queryBuilder.must(buildDrxcQuery()))  // 复用公共条件
-                .withPageable(PageRequest.of(1, 1))
-                .addAggregation(this.getAggs(AggregationBuilders.filter("DRXC", QueryBuilders.matchAllQuery())))  // 因 query 已包含条件，filter 可简化
-                .build();
-
-        SearchHits drxcResponse = this.search(drxcSearchQuery, year);
-        HashMap<String, Object> drxcMap = new HashMap<>();
-        drxcMap.put("total", this.getWorkerOrderCountResult(drxcResponse.getAggregations(), "DRXC"));
-        drxcMap.put("orderStatus", "DRXC");
-        maps.add(drxcMap);
-
-
-        // 次日需处理（18:00-次日7:59创建，appointment_time为空）
-        NativeSearchQuery crxcSearchQuery = new NativeSearchQueryBuilder()
-                .withQuery(queryBuilder.must(buildCrxcQuery()))  // 复用公共条件
-                .withPageable(PageRequest.of(1, 1))
-                .addAggregation(this.getAggs(AggregationBuilders.filter("CRXC", QueryBuilders.matchAllQuery())))
-                .build();
-
-        log.info("CRXC的查询条件: {}", crxcSearchQuery.getQuery().toString());
-
-        SearchHits crxcResponse = this.search(crxcSearchQuery, year);
-        HashMap<String, Object> crxcMap = new HashMap<>();
-        crxcMap.put("total", this.getWorkerOrderCountResult(crxcResponse.getAggregations(), "CRXC"));
-        crxcMap.put("orderStatus", "CRXC");
-        maps.add(crxcMap);
-
         //待抢单
         NativeSearchQuery searchQueryDqd = new NativeSearchQueryBuilder()
                 .withQuery(queryBuilder)
@@ -709,6 +679,35 @@ public class OrderBaseEsLogic {
 
         }
 
+        // 当日需处理（8:00-17:59创建，create_time后移半小时内appointment_time为空）
+        NativeSearchQuery drxcSearchQuery = new NativeSearchQueryBuilder()
+                .withQuery(queryBuilder)
+                .withPageable(PageRequest.of(1, 1))
+                .addAggregation(this.getAggs(AggregationBuilders.filter("DRXC", buildDrxcQuery())))  // 因 query 已包含条件，filter 可简化
+                .build();
+
+        SearchHits drxcResponse = this.search(drxcSearchQuery, year);
+        HashMap<String, Object> drxcMap = new HashMap<>();
+        drxcMap.put("total", this.getWorkerOrderCountResult(drxcResponse.getAggregations(), "DRXC"));
+        drxcMap.put("orderStatus", "DRXC");
+        maps.add(drxcMap);
+
+
+        // 次日需处理（18:00-次日7:59创建，appointment_time为空）
+        NativeSearchQuery crxcSearchQuery = new NativeSearchQueryBuilder()
+                .withQuery(queryBuilder)  // 复用公共条件
+                .withPageable(PageRequest.of(1, 1))
+                .addAggregation(this.getAggs(AggregationBuilders.filter("CRXC", buildCrxcQuery())))
+                .build();
+
+        log.info("CRXC的查询条件: {}", crxcSearchQuery.getQuery().toString());
+
+        SearchHits crxcResponse = this.search(crxcSearchQuery, year);
+        HashMap<String, Object> crxcMap = new HashMap<>();
+        crxcMap.put("total", this.getWorkerOrderCountResult(crxcResponse.getAggregations(), "CRXC"));
+        crxcMap.put("orderStatus", "CRXC");
+        maps.add(crxcMap);
+
         return maps;
     }
 
@@ -789,9 +788,6 @@ public class OrderBaseEsLogic {
 //        return totalOrderNums;
 
         ParsedFilter parsedFilter = aggregations.get(name);
-        if (name.equals("CRXC") && parsedFilter != null) {
-            log.info("CRXC {}, {}", parsedFilter.getDocCount(), JSONUtil.toJsonStr(parsedFilter));
-        }
         return parsedFilter != null ? parsedFilter.getDocCount() : 0L;
     }