Merge remote-tracking branch 'origin/develop' into develop

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

@@ -53,10 +53,7 @@ import java.util.concurrent.locks.Lock;
 public class ESOrderBaseController {
 
     private final OrderBaseLogic orderBaseLogic;
-    private final OrderBaseExcelLogic orderBaseExcelLogic;
-    private final OrderLogLogic orderLogLogic;
-    private final RedisLockRegistry redisLockRegistry;
-    private final CommonLogic commonLogic;
+
 
 
 

mall-server-api/src/main/java/com/gree/mall/manager/es/OrderBaseEsRepository.java

@@ -1,13 +0,0 @@
-package com.gree.mall.manager.es;
-
-
-import com.gree.mall.manager.bean.es.OrderBaseEs;
-import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
-
-/**
- * @author
- * @description
- * @date 2023/6/19 10:37 星期一
- */
-public interface OrderBaseEsRepository extends ElasticsearchRepository<OrderBaseEs, String> {
-}

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

@@ -27,7 +27,6 @@ import com.gree.mall.manager.enums.workorder.OrderBaseStatusEnum;
 import com.gree.mall.manager.enums.workorder.OrderFlagEnum;
 import com.gree.mall.manager.enums.workorder.OrderTypeEnum;
 import com.gree.mall.manager.enums.workorder.SaleTypeEnum;
-import com.gree.mall.manager.es.OrderBaseEsRepository;
 import com.gree.mall.manager.exception.RemoteServiceException;
 import com.gree.mall.manager.logic.common.CommonLogic;
 import com.gree.mall.manager.logic.common.LbsAmapLogic;
@@ -87,7 +86,6 @@ public class OrderBaseLogic {
     private final RegionService regionService;
     private final NoticeRecordService noticeRecordService;
     private final LeaseOrderService leaseOrderService;
-    private final OrderBaseEsRepository orderBaseEsRepository;
 
     /**
      * 工单列表
@@ -1738,9 +1736,8 @@ public class OrderBaseLogic {
     }
 
     public IPage<OrderBaseVO> orderEsBaseList(WorkOrderZfireParam workOrderZfireParam) {
-        Iterable<OrderBaseEs> all = orderBaseEsRepository.findAll();
 
-        log.info("ES打印:"+all);
+
 
         return new Page<>();
     }