From c007868c62c7da5c9ce1bf0e77d9e5f8619826e4 Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期三, 12 六月 2019 12:24:09 +0800 Subject: [PATCH] 查询默认有效调整 --- fanli/src/main/java/com/yeshi/fanli/job/UpdateOrderJob.java | 88 ++++++++++++++++++++++++++++++++++--------- 1 files changed, 69 insertions(+), 19 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/job/UpdateOrderJob.java b/fanli/src/main/java/com/yeshi/fanli/job/UpdateOrderJob.java index 5fc179b..15e72e0 100644 --- a/fanli/src/main/java/com/yeshi/fanli/job/UpdateOrderJob.java +++ b/fanli/src/main/java/com/yeshi/fanli/job/UpdateOrderJob.java @@ -1,6 +1,7 @@ package com.yeshi.fanli.job; import java.util.ArrayList; +import java.util.Calendar; import java.util.Date; import java.util.Iterator; import java.util.List; @@ -11,6 +12,7 @@ import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; +import com.yeshi.fanli.entity.bus.user.LostOrder; import com.yeshi.fanli.entity.bus.user.Order; import com.yeshi.fanli.entity.taobao.PidUser; import com.yeshi.fanli.entity.taobao.TaoBaoOrder; @@ -264,7 +266,7 @@ return orderList; } - private void addOrder(List<TaoBaoOrder> orderList) { + public void addOrder(List<TaoBaoOrder> orderList) { if (orderList != null) for (int i = 0; i < orderList.size(); i++) { @@ -291,11 +293,8 @@ try { taoBaoOrderService.addTaoBaoOrderList(orderList); } catch (Exception e) { - try { - LogHelper.errorDetailInfo(e); - } catch (Exception e1) { - e1.printStackTrace(); - } + LogHelper.errorDetailInfo(e); + } try { @@ -327,11 +326,7 @@ } } } catch (Exception e) { - try { - LogHelper.errorDetailInfo(e); - } catch (Exception e1) { - e1.printStackTrace(); - } + LogHelper.errorDetailInfo(e); } } @@ -398,18 +393,73 @@ orderProcessService.weiQuanOrder(orderList); } - // 澶勭悊鍒嗕韩鍟嗗搧鎵�浜х敓鐨勮鍗�(鍚庣画鐗堟湰搴熼櫎) - // @Scheduled(cron = "0 0/2 * * * ? ") - // public void doPidOrder() { - // if (!Constant.IS_TASK) - // return; - // pidOrderService.doPidOrder(); - // } - // 姣�6涓皬鏃舵墽琛屼竴娆� @Scheduled(cron = "0 0 0/6 * * ? ") public void doLostOrder() { + if (!Constant.IS_TASK) + return; lostOrderService.processFail(); } + // 姣�2鍒嗛挓鎵ц涓�娆� + @Scheduled(cron = "0 0/2 * * * ? ") + public void addLostOrder() { + if (!Constant.IS_TASK) + return; + LogHelper.test("澶勭悊涓㈠け璁㈠崟"); + List<LostOrder> list = lostOrderService.listByStateAndResultCode(LostOrder.STATE_PASS, + LostOrder.RESULT_CODE_VERFING, 1, 50); + if (list != null) + for (LostOrder lo : list) { + List<TaoBaoOrder> taoBaoOrderList = taoBaoOrderService.getTaoBaoOrderByOrderId(lo.getOrderId()); + // 娓呴櫎棰戠巼闄愬埗 + if (taoBaoOrderList != null && taoBaoOrderList.size() > 0) { + String key = "addorderqueue-" + lo.getOrderId(); + redisManager.removeCommonString(key); + addOrder(taoBaoOrderList); + LogHelper.test("鑷姩澶勭悊娣樺疂璁㈠崟:" + lo.getOrderId()); + } + } + } + + /** + * 澶勭悊娣樺疂缁撶畻璁㈠崟,30fen鎵ц涓�娆� + */ + @Scheduled(cron = "30 0 0/1 * * ? ") + public void doSettleOrders() { + if (!Constant.IS_TASK) + return; + // 澶勭悊3-15澶╁墠鐨勮鍗曪紝姣忓ぉ璺戜竴娆� + Calendar ca = Calendar.getInstance(); + int hour = ca.get(Calendar.HOUR_OF_DAY); + + long startTime = TimeUtil.convertToTimeTemp( + TimeUtil.getGernalTime(ca.getTimeInMillis() - 1000 * 60 * 60 * 24 * 3L, "yyyy-MM-dd"), "yyyy-MM-dd") + - hour * (1000 * 60 * 60 * 12L); + long endTime = startTime + 1000 * 60 * 60 * 12L; + List<TaoBaoOrder> orderList = TaoKeOrderApiUtil.getTaoBaoSettleOrders(startTime, endTime, false); + List<TaoBaoOrder> tempOrderList = TaoKeOrderApiUtil.getTaoBaoSettleOrders(startTime, endTime, true); + if (tempOrderList != null && tempOrderList.size() > 0) + orderList.addAll(tempOrderList); + addOrder(orderList); + } + + /** + * 13鍒嗛挓鏇存柊鏈�杩�13鍒嗛挓鐨勭粨绠楁暟鎹� + */ + @Scheduled(cron = "0 0/13 * * * ? ") + public void doSettleOrdersToday() { + if (!Constant.IS_TASK) + return; + // 澶勭悊3-15澶╁墠鐨勮鍗曪紝姣忓ぉ璺戜竴娆� + Calendar ca = Calendar.getInstance(); + long startTime = ca.getTimeInMillis() - 1000 * 60 * 5L - 1000 * 60 * 13L; + long endTime = startTime + 1000 * 60 * 13L; + List<TaoBaoOrder> orderList = TaoKeOrderApiUtil.getTaoBaoSettleOrders(startTime, endTime, false); + List<TaoBaoOrder> tempOrderList = TaoKeOrderApiUtil.getTaoBaoSettleOrders(startTime, endTime, true); + if (tempOrderList != null && tempOrderList.size() > 0) + orderList.addAll(tempOrderList); + addOrder(orderList); + } + } -- Gitblit v1.8.0