es

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

@@ -18,6 +18,7 @@ import com.gree.mall.manager.bean.ItfTblWorkOrderCollection0Bean;
 import com.gree.mall.manager.bean.WorkOrderRelationBean;
 import com.gree.mall.manager.bean.WorkOrderSearchReq;
 
+import com.gree.mall.manager.bean.es.OrderBaseEsDate;
 import com.gree.mall.manager.bean.policy.ItfGreeSynDownloadRecBean;
 import com.gree.mall.manager.bean.workorder.WorkerOrderSyncBean;
 import com.gree.mall.manager.commonmapper.workorder.SyncMapper;
@@ -589,4 +590,6 @@ public class SyncOrderInfoLogic {
 
 
     }
+
+
 }

mall-server-api/src/main/java/com/gree/mall/manager/logic/websit/SettlementOrderLogic.java

@@ -212,7 +212,7 @@ public class SettlementOrderLogic {
         List<SettlementOrder> settlementOrders = settlementOrderService.lambdaQuery().in(SettlementOrder::getSettlementOrderId, id).list();
 
         for (SettlementOrder settlementOrder : settlementOrders) {
-            wechatLogic.shareSettlementAmount(settlementOrder);
+            wechatLogic.shareSettlementAmountCorn(settlementOrder);
         }
 
 

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

@@ -267,16 +267,16 @@ public class OrderBaseEsLogic {
 
 
     public void test() {
-        boolean a = elasticsearchRestTemplate.indexOps(OrderBaseEs.class).delete();
+  /*      boolean a = elasticsearchRestTemplate.indexOps(OrderBaseEs.class).delete();
         IndexOperations indexOperations1 = elasticsearchRestTemplate.indexOps(OrderBaseEsDate.class);
         if (!indexOperations1.exists()) {
             indexOperations1.create();
             Document document = indexOperations1.createMapping();
             indexOperations1.putMapping(document);
         }
-        List<PgOrderBase> list = pgOrderBaseService.lambdaQuery().list();
+        List<PgOrderBase> list = pgOrderBaseService.lambdaQuery().list();*/
 
-        List<OrderBaseEsDate> orderBaseEsDates = BeanUtil.copyToList(list, OrderBaseEsDate.class);
+       // List<OrderBaseEsDate> orderBaseEsDates = BeanUtil.copyToList(list, OrderBaseEsDate.class);
   /*      for (PgOrderBase pgOrderBase : list) {
             OrderBaseEs orderBaseEs = BeanUtil.toBean(pgOrderBase, OrderBaseEs.class);
 
@@ -290,7 +290,7 @@ public class OrderBaseEsLogic {
             orderBaseEsList.add(orderBaseEs);
         }*/
 
-       orderBaseEsRepository.saveAll(orderBaseEsDates);
+      // orderBaseEsRepository.saveAll(orderBaseEsDates);
 
     }
 
@@ -546,4 +546,13 @@ public class OrderBaseEsLogic {
         return totalOrderNums;
     }
 
+    public void esSync() {
+
+        List<PgOrderBase> list = pgOrderBaseService.lambdaQuery().list();
+
+        List<OrderBaseEsDate> orderBaseEsDates = BeanUtil.copyToList(list, OrderBaseEsDate.class);
+
+
+        orderBaseEsRepository.saveAll(orderBaseEsDates);
+    }
 }

mall-server-api/src/main/java/com/gree/mall/manager/schedule/daily/EsSyncSchedule.java

@@ -0,0 +1,37 @@
+package com.gree.mall.manager.schedule.daily;
+
+
+
+import com.gree.mall.manager.logic.EsOrder.EsOrderLogic;
+import com.gree.mall.manager.logic.SyncOrderInfoLogic;
+import com.gree.mall.manager.logic.workorder.OrderBaseEsLogic;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import javax.mail.MessagingException;
+import java.io.IOException;
+
+/**
+ * 定时购买保险
+ */
+@ConditionalOnProperty(name = "schedule.gongdan.es.enable", havingValue = "true", matchIfMissing = true)
+@Component
+public class EsSyncSchedule {
+
+
+    @Autowired
+    private OrderBaseEsLogic orderBaseEsLogic;
+
+
+
+    //同步工单数据
+    @Scheduled(fixedDelay =2* 1000)
+    public void task() throws IOException {
+        orderBaseEsLogic.esSync();
+    }
+
+
+
+}

mall-server-api/src/main/resources/bootstrap-dev.properties

@@ -9,6 +9,7 @@ express.callback=${sys.url}/${server.servlet.context-path}/common/express/callba
 #定时器
 schedule.enable=false
 schedule.gongdan.enable=false
+schedule.gongdan.es.enable=false
 #分销商城商品接口
 gjmall.goods.url=http://121.43.111.127:10003/goods/outside/list
 

mall-server-api/src/main/resources/bootstrap-prd.properties

@@ -9,6 +9,7 @@ express.callback=${sys.url}/${server.servlet.context-path}/common/express/callba
 #定时器
 schedule.enable=true
 schedule.gongdan.enable=false
+schedule.gongdan.es.enable=false
 #分销商城商品接口
 gjmall.goods.url=https://gjmall.zfire.top/api/goods/outside/list
 

mall-server-api/src/main/resources/bootstrap-test.properties

@@ -9,6 +9,7 @@ express.callback=${sys.url}/${server.servlet.context-path}/common/express/callba
 #定时器
 schedule.enable=true
 schedule.gongdan.enable=false
+schedule.gongdan.es.enable=false
 #分销商城商品接口
 gjmall.goods.url=http://121.43.111.127:10003/goods/outside/list