From b6f1e646ac5005b4f4bad7c1eec706c96f2eaca7 Mon Sep 17 00:00:00 2001 From: Administrator <335182714> Date: 星期二, 05 八月 2025 14:39:46 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 94 +++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 78 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java index cf74bfc..10d0ebb 100644 --- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java +++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java @@ -1,10 +1,26 @@ 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.entity.Review; +import com.zy.asrs.entity.ReviewDetl; +import com.zy.asrs.service.ApiLogService; import com.zy.asrs.service.OrderService; +import com.zy.asrs.service.ReviewDetlService; +import com.zy.asrs.service.ReviewService; +import com.zy.asrs.task.core.ReturnT; +import com.zy.asrs.task.handler.OrderSyncHandler; +import com.zy.system.entity.Config; +import com.zy.system.mapper.ConfigMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import java.util.List; /** * Created by vincent on 2020/7/7 @@ -14,26 +30,72 @@ public class OrderSyncScheduler { @Autowired + private OrderSyncHandler orderSyncHandler; + @Autowired private OrderService orderService; + @Autowired + private ReviewService reviewService; + @Autowired + private ReviewDetlService reviewDetlService; + @Autowired + private ApiLogService apiLogService; + @Resource + private ConfigMapper configMapper; - @Scheduled(cron = "0/3 * * * * ? ") - private void queryAndSave(){ -// for (WrkMast wrkMast : wrkMasts) { -// ReturnT<String> result = workLogHandler.start(wrkMast); -// if (!result.isSuccess()) { -// log.error("宸ヤ綔妗workNo={}]鍘嗗彶妗e鐞嗗け璐�", wrkMast.getWrkNo()); -// } -// } + @Scheduled(cron = "0 0 1 * * ? ") + public void clearApiLog() { + try { + apiLogService.clearWeekBefore(); + } catch (Exception e) { + log.error("绗笁鏂规帴鍙f棩蹇楄嚜鍔ㄦ竻闄ゅけ璐ワ紙鑼冨洿锛氫竴鍛ㄤ箣鍓�", e); + } } - @Scheduled(cron = "0/3 * * * * ? ") - private void completeAndReport(){ -// for (WrkMast wrkMast : wrkMasts) { -// ReturnT<String> result = workLogHandler.start(wrkMast); -// if (!result.isSuccess()) { -// log.error("宸ヤ綔妗workNo={}]鍘嗗彶妗e鐞嗗け璐�", wrkMast.getWrkNo()); -// } -// } + @Scheduled(cron = "0/9 * * * * ? ") + @Async("orderThreadPool") + public void completeAndReport() { + Config config = configMapper.selectConfigByCode("erpReport"); + if (config == null || config.getStatus() == 0) { + return; + } + + List<Order> orders = orderService.selectComplete(); + for (Order order : orders) { + try { + ReturnT<String> result = orderSyncHandler.start(order); + if (!result.isSuccess()) { + log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo()); + } + } catch (Exception e) { + log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo()); + log.error("璁㈠崟" + order + "澶勭悊澶辫触锛屽紓甯镐俊鎭細" + e); + } + } + } + + @Scheduled(cron = "0/30 * * * * ? ") + public void complete() { + List<Review> orders = reviewService.selectList(new EntityWrapper<Review>().eq("settle", 2)); + for (Review order : orders) { + try { + boolean flag = true; + List<ReviewDetl> reviewDetls = reviewDetlService.selectList(new EntityWrapper<ReviewDetl>().eq("order_no", order.getOrderNo())); + for (ReviewDetl reviewDetl : reviewDetls) { + if (Cools.isEmpty(reviewDetl.getInspect()) || reviewDetl.getInspect() == 0) { + flag = false; + break; + } + } + if (flag) { + order.setSettle(4L); + reviewService.updateById(order); + } + log.info("鍗曟嵁[orderNo={}]澶勭悊瀹屾垚", order.getOrderNo()); + } catch (Exception e) { + log.error("鍗曟嵁[orderNo={}]澶勭悊澶辫触锛屽紓甯镐俊鎭細" + e, order.getOrderNo()); + } + } + } } -- Gitblit v1.9.1