修复h5端统计工单状态不一致的条件

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

@@ -30,7 +30,6 @@ import com.gree.mall.miniapp.utils.StringUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.elasticsearch.client.RestHighLevelClient;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
@@ -40,13 +39,14 @@ import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuil
 import org.elasticsearch.search.aggregations.bucket.filter.ParsedFilter;
 import org.elasticsearch.search.sort.SortBuilders;
 import org.elasticsearch.search.sort.SortOrder;
-import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
 import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate;
 import org.springframework.data.elasticsearch.core.SearchHits;
-import org.springframework.data.elasticsearch.core.query.*;
+import org.springframework.data.elasticsearch.core.query.NativeSearchQuery;
+import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
+import org.springframework.data.elasticsearch.core.query.Query;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -244,7 +244,10 @@ public class OrderBaseLogic {
                 .build();
         SearchHits responseWWG = elasticsearchRestTemplate.search(searchQueryWWG, OrderBaseEs.class);
         countOrderStatusBean.setWwg(this.getWorkerOrderCountResult(responseWWG.getAggregations(),"WWG"));
-        countOrderStatusBean.setAll(orderBaseIds.size());
+//        countOrderStatusBean.setAll(orderBaseIds.size());
+        countOrderStatusBean.setAll(countOrderStatusBean.getDjd() + countOrderStatusBean.getFwz() + countOrderStatusBean.getYcd()
+                + countOrderStatusBean.getDqd() + countOrderStatusBean.getYwg() + countOrderStatusBean.getJrwg()
+                + countOrderStatusBean.getJbnwg());
 
         return countOrderStatusBean;
     }