‘linchangsheng’ 4 months ago
parent
commit
84f5e4e464

+ 1 - 2
mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/order/PayOrderLogic.java

@@ -489,8 +489,7 @@ public class PayOrderLogic {
 
         List<WorkerOrderItem> workerOrderItems = workerOrderItemService.lambdaQuery().eq(WorkerOrderItem::getOrderId, workerOrder.getOrderId()).list();
 
-
-        workerOrder.setSource(commonLogic.getSource().equals(OrderInfoSourceEnum.A)?OrderInfoSourceEnum.A.getRemark():OrderInfoSourceEnum.B.getRemark() );
+        workerOrder.setSource(commonLogic.getSource().equals("A")?OrderInfoSourceEnum.A.getRemark():OrderInfoSourceEnum.B.getRemark() );
 
         workerOrder.setPayTime(new Date());
         workerOrder.setPayType(payType);

+ 1 - 1
mall-server-api/src/main/java/com/gree/mall/manager/controller/workerorder/ESOrderBaseController.java

@@ -81,7 +81,7 @@ public class ESOrderBaseController {
         ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean);
         //2.查询要导出的内容
         zfireParamBean.setPageNum(1);
-        zfireParamBean.setPageSize(10000);
+        zfireParamBean.setPageSize(30000);
         IPage<OrderBaseVO> orderBaseVOIPage = orderBaseEsLogic.orderBaseEsList(zfireParamBean);
         //3.导出
         FieldUtils.exportData(orderBaseVOIPage.getRecords(), zfireParam.getExportFields(), request, response);

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

@@ -113,6 +113,8 @@ public class OrderBaseEsLogic {
                 .withPageable(PageRequest.of(zfireParamBean.getPageNum() -1, zfireParamBean.getPageSize()))
                 .build();
 
+        build.setTrackTotalHits(true);
+
 
         SearchHits<OrderBaseEs> orderBaseEsSearchHits = elasticsearchRestTemplate.search(build, OrderBaseEs.class);
         SearchPage<OrderBaseEs> searchHits = SearchHitSupport.searchPageFor(orderBaseEsSearchHits, build.getPageable());