Forráskód Böngészése

BUG修改 订单大于1W时显示总数有误

秦国才 4 éve
szülő
commit
566cd79bba

+ 29 - 0
modules/admin/pom.xml

@@ -10,10 +10,39 @@
     <artifactId>admin</artifactId>
     <dependencies>
         <!-- ==================ES配置================== start-->
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-starter-data-elasticsearch</artifactId>-->
+
+<!--        </dependency>-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-elasticsearch</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.data</groupId>
+                    <artifactId>spring-data-elasticsearch</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
+
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-elasticsearch</artifactId>
+            <version>4.2.1</version>
+            <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <artifactId>jcl-over-slf4j</artifactId>
+                    <groupId>org.slf4j</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>log4j-core</artifactId>
+                    <groupId>org.apache.logging.log4j</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
         <!-- ==================ES配置================== end-->
         <dependency>
             <groupId>org.projectlombok</groupId>

+ 5 - 0
modules/admin/src/main/java/com/fire/admin/service/OrderManagementService.java

@@ -145,6 +145,7 @@ public class OrderManagementService {
         NativeSearchQuery query = new NativeSearchQueryBuilder()
                 .withPageable(pageable)
                 .withQuery(boolQuery)
+                .withTrackTotalHits(true)
                 .build();
         //查询数据
         try {
@@ -279,6 +280,7 @@ public class OrderManagementService {
 
         NativeSearchQuery query = new NativeSearchQueryBuilder()
                 .withPageable(pageable)
+                .withTrackTotalHits(true)
                 .withQuery(boolQuery)
                 .addAggregation(sumBuilder)
                 .build();
@@ -394,6 +396,7 @@ public class OrderManagementService {
         NativeSearchQuery query = new NativeSearchQueryBuilder()
                 .withPageable(pageable)
                 .withQuery(boolQuery)
+                .withTrackTotalHits(true)
                 .build();
         //查询数据
         try {
@@ -513,6 +516,7 @@ public class OrderManagementService {
         NativeSearchQuery query = new NativeSearchQueryBuilder()
                 .withSort(timeSort)
                 .withQuery(boolQuery)
+                .withTrackTotalHits(true)
                 .build();
         //查询数据
         try {
@@ -605,6 +609,7 @@ public class OrderManagementService {
         NativeSearchQuery query = new NativeSearchQueryBuilder()
                 .withSort(timeSort)
                 .withQuery(boolQuery)
+                .withTrackTotalHits(true)
                 .build();
         //查询数据
         try {