From 7ad79ee463adbdbc51e37c12ae025fb8598ab670 Mon Sep 17 00:00:00 2001 From: zyx <zyx123456> Date: 星期日, 07 四月 2024 14:25:36 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 36 +++++++++++++++++++++++++++++------- 1 files changed, 29 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java index 4631099..c9027d1 100644 --- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java +++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java @@ -1,12 +1,15 @@ package com.zy.asrs.task; -import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.core.common.Cools; import com.zy.asrs.entity.Order; +import com.zy.asrs.service.ApiLogService; import com.zy.asrs.service.OrderService; import com.zy.asrs.task.core.ReturnT; import com.zy.asrs.task.handler.OrderSyncHandler; +import com.zy.common.entity.Parameter; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -24,15 +27,34 @@ private OrderSyncHandler orderSyncHandler; @Autowired private OrderService orderService; + @Autowired + private ApiLogService apiLogService; - @Scheduled(cron = "0/5 * * * * ? ") + + @Value("${erp.enable}") + private Boolean erpEnable; + + @Scheduled(cron = "0 0 1 * * ? ") + public void clearApiLog(){ + try { + apiLogService.clearWeekBefore(); + } catch (Exception e) { + log.error("绗笁鏂规帴鍙f棩蹇楄嚜鍔ㄦ竻闄ゅけ璐ワ紙鑼冨洿锛氫竴鍛ㄤ箣鍓�", e); + } + } + +// @Scheduled(cron = "0/5 * * * * ? ") @Async("orderThreadPool") public void completeAndReport(){ - List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L).eq("status", 1)); - for (Order order : orders) { - ReturnT<String> result = orderSyncHandler.start(order); - if (!result.isSuccess()) { - log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo()); + if (!erpEnable) return; + String erpReport = Parameter.get().getErpReport(); + if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) { + List<Order> orders = orderService.selectComplete(); + for (Order order : orders) { + ReturnT<String> result = orderSyncHandler.start(order); + if (!result.isSuccess()) { + log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo()); + } } } } -- Gitblit v1.9.1