From 42ba7926de5f21a2856e4c7b9c5ce148413b6cbe Mon Sep 17 00:00:00 2001 From: zhang <zc857179121@qq.com> Date: 星期六, 13 九月 2025 12:54:05 +0800 Subject: [PATCH] 1 --- src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 69 ++++++++++++++++++++++++++++++++++ 1 files changed, 68 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java index a461c16..378c848 100644 --- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java +++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java @@ -1,8 +1,14 @@ 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; @@ -28,12 +34,16 @@ @Autowired private OrderService orderService; @Autowired + private ReviewService reviewService; + @Autowired + private ReviewDetlService reviewDetlService; + @Autowired private ApiLogService apiLogService; @Resource private ConfigMapper configMapper; @Scheduled(cron = "0 0 1 * * ? ") - public void clearApiLog(){ + public void clearApiLog() { try { apiLogService.clearWeekBefore(); } catch (Exception e) { @@ -64,4 +74,61 @@ } + //@Scheduled(cron = "0/9 * * * * ? ") + //@Async("orderThreadPool") + public void completeAndReport2() { + Config config = configMapper.selectConfigByCode("RETURN_REPORT"); + if (config == null || config.getStatus() == 0 || Cools.isEmpty(config.getValue())) { + return; + } + List<Order> orders = orderService.selectComplete2(); + 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); + } + } + orders = orderService.selectComplete3(); + 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