From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/job/order/taobao/UpdateOrderJob.java | 477 +++++++++++++++++++++++------------------------------------
1 files changed, 184 insertions(+), 293 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/job/order/taobao/UpdateOrderJob.java b/fanli/src/main/java/com/yeshi/fanli/job/order/taobao/UpdateOrderJob.java
index 0463ff4..35112d8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/job/order/taobao/UpdateOrderJob.java
+++ b/fanli/src/main/java/com/yeshi/fanli/job/order/taobao/UpdateOrderJob.java
@@ -13,9 +13,10 @@
import javax.annotation.Resource;
-import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import com.xxl.job.core.biz.model.ReturnT;
+import com.xxl.job.core.handler.annotation.XxlJob;
import com.yeshi.fanli.dto.taobao.WeiQuanOrderResult;
import com.yeshi.fanli.entity.bus.user.LostOrder;
import com.yeshi.fanli.entity.bus.user.Order;
@@ -26,18 +27,20 @@
import com.yeshi.fanli.service.inter.common.DataMonitorService;
import com.yeshi.fanli.service.inter.order.CommonOrderService;
import com.yeshi.fanli.service.inter.order.LostOrderService;
+import com.yeshi.fanli.service.inter.order.OrderMoneySettleService;
import com.yeshi.fanli.service.inter.order.OrderProcessService;
import com.yeshi.fanli.service.inter.order.OrderService;
-import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService;
+import com.yeshi.fanli.service.inter.order.tb.TaoBaoOrderService;
+import com.yeshi.fanli.service.inter.order.tb.TaoBaoWeiQuanOrderService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
-import com.yeshi.fanli.service.inter.taobao.TaoBaoWeiQuanOrderService;
import com.yeshi.fanli.util.CMQManager;
import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.RedisKeyEnum;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
-import com.yeshi.fanli.util.TaoBaoConstant;
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;
+import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import com.yeshi.fanli.util.taobao.TaoKeOrderApiUtil;
//浠庢窐瀹濈埇鍘昏鍗曟洿鏂�
@@ -78,6 +81,9 @@
@Resource
private CommonOrderService commonOrderService;
+ @Resource
+ private OrderMoneySettleService orderMoneySettleService;
+
/**
* 鏂扮増鑾峰彇鏅�氳鍗�
*
@@ -86,40 +92,22 @@
* @return
*/
private static List<TaoBaoOrder> getCommonOrder(long startTime, int span) {
- int page = 1;
- String startTimeStr = TimeUtil.getGernalTime(startTime, "yyyy-MM-dd HH:mm:ss");
- List<TaoBaoOrder> orderList = TaoKeOrderApiUtil.getTaoBaoAllOrder(startTimeStr, span, page,TaoKeOrderApiUtil.TK_STATUS_ALL,
- TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
- while (orderList.size() == 100 * page) {
- page++;
- List<TaoBaoOrder> tempOrderList = TaoKeOrderApiUtil.getTaoBaoAllOrder(startTimeStr, span, page,TaoKeOrderApiUtil.TK_STATUS_ALL,
- TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
- if (tempOrderList != null && tempOrderList.size() > 0)
- orderList.addAll(tempOrderList);
- }
- return orderList;
- }
+ List<TaoBaoOrder> totalList = new ArrayList<>();
+ List<TaoBaoOrder> orderList = TaoKeOrderApiUtil.getTaoBaoCommonOrderList(startTime, startTime + span * 1000L,
+ 1);
+ if (orderList != null && orderList.size() > 0)
+ totalList.addAll(orderList);
- /**
- * 鑾峰彇绗笁鏂规櫘閫氳鍗�
- *
- * @param startTime
- * @param span
- * @return
- */
- private static List<TaoBaoOrder> getThirdCommonOrder(long startTime, int span) {
- int page = 1;
- String startTimeStr = TimeUtil.getGernalTime(startTime, "yyyy-MM-dd HH:mm:ss");
- List<TaoBaoOrder> orderList = TaoKeOrderApiUtil.getTaoBaoThirdAllOrder(startTimeStr, span, page,TaoKeOrderApiUtil.TK_STATUS_ALL,
- TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
- while (orderList.size() == 100 * page) {
- page++;
- List<TaoBaoOrder> tempOrderList = TaoKeOrderApiUtil.getTaoBaoThirdAllOrder(startTimeStr, span, page,TaoKeOrderApiUtil.TK_STATUS_ALL,
- TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
- if (tempOrderList != null && tempOrderList.size() > 0)
- orderList.addAll(tempOrderList);
- }
- return orderList;
+ orderList = TaoKeOrderApiUtil.getTaoBaoCommonOrderList(startTime, startTime + span * 1000L, 2);
+ if (orderList != null && orderList.size() > 0)
+ totalList.addAll(orderList);
+
+ orderList = TaoKeOrderApiUtil.getTaoBaoCommonOrderList(startTime, startTime + span * 1000L, 3);
+ if (orderList != null && orderList.size() > 0)
+ totalList.addAll(orderList);
+ // 绉婚櫎閲嶅浜ゆ槗鍙风殑璁㈠崟
+
+ return totalList;
}
/**
@@ -130,52 +118,21 @@
* @return
*/
public static List<TaoBaoOrder> getCommonOrder(long startTime, long endTime) {
- List<TaoBaoOrder> orderList = new ArrayList<>();
- long span = (endTime - startTime) % 1000 == 0 ? (endTime - startTime) / 1000 : (endTime - startTime) / 1000 + 1;
- int count = (int) (span / 1200);
- if (span % 1200 != 0)
- count++;
- for (int i = 0; i < count; i++) {
- long startT = startTime + i * 1200 * 1000L;
- int s = 1200;
- if (endTime < startT + 1200 * 1000L) {
- s = (int) ((endTime - startT) / 1000) + 1;
- if (s < 60)
- s = 60;
- }
- List<TaoBaoOrder> tempOrderList = getCommonOrder(startT, s);
- if (tempOrderList != null && tempOrderList.size() > 0)
- orderList.addAll(tempOrderList);
- }
- return orderList;
- }
+ List<TaoBaoOrder> totalList = new ArrayList<>();
+ List<TaoBaoOrder> orderList = TaoKeOrderApiUtil.getTaoBaoCommonOrderList(startTime, endTime, 1);
+ if (orderList != null && orderList.size() > 0)
+ totalList.addAll(orderList);
- /**
- * 鐖彇涓夋柟璁㈠崟
- *
- * @param startTime
- * @param endTime
- * @return
- */
- public static List<TaoBaoOrder> getThirdCommonOrder(long startTime, long endTime) {
- List<TaoBaoOrder> orderList = new ArrayList<>();
- long span = (endTime - startTime) % 1000 == 0 ? (endTime - startTime) / 1000 : (endTime - startTime) / 1000 + 1;
- int count = (int) (span / 1200);
- if (span % 1200 != 0)
- count++;
- for (int i = 0; i < count; i++) {
- long startT = startTime + i * 1200 * 1000L;
- int s = 1200;
- if (endTime < startT + 1200 * 1000L) {
- s = (int) ((endTime - startT) / 1000) + 1;
- if (s < 60)
- s = 60;
- }
- List<TaoBaoOrder> tempOrderList = getThirdCommonOrder(startT, s);
- if (tempOrderList != null && tempOrderList.size() > 0)
- orderList.addAll(tempOrderList);
- }
- return orderList;
+ orderList = TaoKeOrderApiUtil.getTaoBaoCommonOrderList(startTime, endTime, 2);
+ if (orderList != null && orderList.size() > 0)
+ totalList.addAll(orderList);
+
+ orderList = TaoKeOrderApiUtil.getTaoBaoCommonOrderList(startTime, endTime, 3);
+ if (orderList != null && orderList.size() > 0)
+ totalList.addAll(orderList);
+ // 绉婚櫎閲嶅浜ゆ槗鍙风殑璁㈠崟
+
+ return totalList;
}
/**
@@ -196,40 +153,8 @@
}
public void updateOrder(long startTime, long endTime) {
- // 鑰佺増鏈鐞嗘柟寮�
- // List<TaoBaoUnionConfig> configList =
- // taoBaoUnionConfigService.getConfigByTypeCache(PidUser.TYPE_FANLI_ANDROID);
- // List<TaoBaoOrder> orderList = new ArrayList<>();
- // try {
- // orderList = TaoBaoOrderUtil.getOrderList(startTime, endTime,
- // configList.get(0));
- // } catch (TaoBaoOrderException e2) {
- // try {
- // LogHelper.errorDetailInfo(e2);
- // } catch (Exception e) {
- // e.printStackTrace();
- // }
- // }
- // List<TaoBaoOrder> thirdOrderList = new ArrayList<>();
- // try {
- // thirdOrderList = TaoBaoOrderUtil.getThirdServiceOrderList(startTime,
- // endTime, configList.get(0));
- // } catch (TaoBaoOrderException e2) {
- // try {
- // LogHelper.errorDetailInfo(e2);
- // } catch (Exception e) {
- // e.printStackTrace();
- // }
- // }
- // if (thirdOrderList != null && thirdOrderList.size() > 0)
- // orderList.addAll(thirdOrderList);
- // 鏂扮増鏈鐞嗘柟寮�
List<TaoBaoOrder> orderList = getCommonOrder(startTime, endTime);
- List<TaoBaoOrder> tempOrderList2 = getThirdCommonOrder(startTime, endTime);
- if (tempOrderList2 != null && tempOrderList2.size() > 0)
- orderList.addAll(tempOrderList2);
-
- LogHelper.orderInfo("姝ｅ湪鎵ц璁㈠崟鐖彇缁撴潫锛屽叡鏈夎鍗�:" + orderList.size());
+ LogHelper.orderInfo("甯歌璁㈠崟鍏辨湁璁㈠崟:" + orderList.size());
addOrder(orderList);
try {
Thread.sleep(10000);
@@ -278,6 +203,7 @@
if (orderList != null)
for (int i = 0; i < orderList.size(); i++) {
+ LogHelper.orderInfo("甯歌璁㈠崟鐖彇:" + orderList.get(i).getOrderId());
// 绉婚櫎浼氬憳杩愯惀ID涓庢笭閬撲笓灞炶鍗�
if (orderList.get(i).getAdPositionName().contains("浼氬憳杩愯惀")
|| orderList.get(i).getAdPositionName().contains("娓犻亾涓撳睘")) {
@@ -310,8 +236,7 @@
Iterator<String> its = map.keySet().iterator();
while (its.hasNext()) {
String key = its.next();
- List<TaoBaoOrder> orders = map.get(key);
- String redisKey = "addorderqueue-" + key;
+ String redisKey = RedisKeyEnum.getRedisKey(RedisKeyEnum.addOrderQueue, key);
// redis鍋氶鐜囬檺鍒�
try {
if (!StringUtil.isNullOrEmpty(redisManager.getCommonString(redisKey))) {
@@ -335,58 +260,6 @@
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
}
- }
-
- // 姣�15鍒嗛挓鐖彇涓�娆�
- @Scheduled(cron = "0 0/15 * * * ? ")
- public void doJob1() {
- if (!Constant.IS_TASK)
- return;
- long currentTime = System.currentTimeMillis() - 1000 * 60;
- String h = TimeUtil.getGernalTime(currentTime, "HH");
- String m = TimeUtil.getGernalTime(currentTime, "mm");
- int mm = Integer.parseInt(h) * 60 + Integer.parseInt(m);
- int pos = mm / 15;
- if (pos >= 90)
- pos = 89;
- long startTime = TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(currentTime, "yyyy-MM-dd"), "yyyy-MM-dd")
- - (1000 * 60 * 60 * 24L * (90 - pos));
- long endTime = startTime + 1000 * 60 * 60 * 24L;
- LogHelper.orderInfo("姝ｅ湪鎵ц璁㈠崟鐖彇...");
- updateOrder(startTime, endTime);
- }
-
- // 娣樺疂鎺ㄥ箍璁㈠崟 姣忛殧3鍒�13绉掓墽琛屼竴娆�
- @Scheduled(cron = "13 0/3 * * * ? ")
- public void doJob6() {
- if (!Constant.IS_TASK)
- return;
- long endTime = System.currentTimeMillis() - 1000 * 60;
- updateOrder(endTime - 1000 * 60 * 20L, endTime);
- }
-
- // 杩斿埄
- @Scheduled(cron = "0 0/5 * * * ? ")
- public void doJob2() {
- if (!Constant.IS_TASK)
- return;
- LogHelper.error("澶勭悊杩斿埄鍒拌处鍓嶇疆");
- try {
-
- doTaoBaoWeiQuanOrder(2);
- } catch (Exception e) {
- LogHelper.errorDetailInfo(e);
- }
- LogHelper.error("寮�濮嬪鐞嗚繑鍒�");
- orderProcessService.fanli();
- }
-
- // 姣忔湀25鍙�9鐐规墽琛岃繑鍒�
- @Scheduled(cron = "0 0 9 25 * ? ")
- public void doJob3() {
- if (!Constant.IS_TASK)
- return;
- orderProcessService.fanliInvaiteAndShare();
}
private void doTaoBaoWeiQuanOrder(int day) {
@@ -450,131 +323,12 @@
}
- // 缁存潈璁㈠崟澶勭悊-澶勭悊鏈�杩�60澶╃殑
- // 30鍒嗛挓涓�娆�
- @Scheduled(cron = "0 0/30 * * * ? ")
- public void doTaoBaoWeiQuan() {
- if (!Constant.IS_TASK)
- return;
- doTaoBaoWeiQuanOrder(5);
- }
-
- // 姣�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);
- }
-
- /**
- * 鏇存柊鏈湴璁㈠崟锛堝噷鏅�25鍒嗘洿鏂帮級
- */
- @Scheduled(cron = "25 0 0 * * ? ")
- public void doLocalTaoBaoOrder() {
- if (!Constant.IS_TASK)
- return;
- // 澶勭悊3-15澶╁墠鐨勮鍗曪紝姣忓ぉ璺戜竴娆�
- Long startTime = System.currentTimeMillis() - 1000 * 60 * 60 * 24 * 60L;
- Long endTime = startTime + 1000 * 60 * 60 * 24 * 48L;
- List<CommonOrder> commonOrderList = commonOrderService.listBySourceTypeAndStateAndThirdCrateTime(
- Constant.SOURCE_TYPE_TAOBAO, CommonOrder.STATE_FK, startTime, endTime, 1, 500);
- Set<String> orderIds = new HashSet<>();
- for (CommonOrder co : commonOrderList) {
- orderIds.add(co.getOrderNo());
- }
-
- for (Iterator<String> its = orderIds.iterator(); its.hasNext();) {
- String orderId = its.next();
- List<TaoBaoOrder> orderList = taoBaoOrderService.getTaoBaoOrderByOrderId(orderId);
- Map<String, List<TaoBaoOrder>> orders = new HashMap<>();
- orders.put(orderId, orderList);
- orderProcessService.processOrder(orders);
- }
- }
-
- /**
- * 鏇存柊鏈�杩戠殑鏈湴鍗�(30鍒嗛挓鏇存柊涓�娆�)
- */
-
- @Scheduled(cron = "0 0/30 * * * ? ")
- public void doLatestLocalTaoBaoOrder() {
- if (!Constant.IS_TASK)
- return;
- Long endTime = System.currentTimeMillis() - 1000 * 60 * 10L;
- Long startTime = endTime - 1000 * 60 * 60 * 12L;
- updateLocalTaoBaoOrder(startTime, endTime, 1, 2000);
-
- }
-
public void updateLocalTaoBaoOrder(Long startTime, Long endTime, int page, int count) {
List<TaoBaoOrder> list = taoBaoOrderService.listBySettlementTime(startTime, endTime, page, count);
Set<String> orderIds = new HashSet<>();
for (TaoBaoOrder co : list) {
orderIds.add(co.getOrderId());
}
-
for (Iterator<String> its = orderIds.iterator(); its.hasNext();) {
String orderId = its.next();
// 鏌ヨ鏄惁鏈夊浜庤鍗曚粯娆剧姸鎬佺殑鍗�
@@ -588,7 +342,6 @@
break;
}
}
-
if (update) {
List<TaoBaoOrder> orderList = taoBaoOrderService.getTaoBaoOrderByOrderId(orderId);
Map<String, List<TaoBaoOrder>> orders = new HashMap<>();
@@ -598,10 +351,124 @@
}
}
- @Scheduled(cron = "30 13 3 * * ? ")
- public void doLatest5DayLocalTaoBaoOrder() {
- if (!Constant.IS_TASK)
- return;
+ @XxlJob("updateTaoBaoCommonOrderHandler")
+ public ReturnT<String> updateTaoBaoCommonOrder(String param) throws Exception {
+ if ("1".equalsIgnoreCase(param)) {// 鏇存柊杩�20鍒嗛挓鍐呯殑鍗�
+ pullLatestCommonOrder();
+ } else if ("1day".equalsIgnoreCase(param)) {// 鐖彇鏈�杩�1澶╃殑璁㈠崟(30鍒嗛挓涓�娆�)
+ pullLatestDayCommonOrder();
+ } else if ("3day".equalsIgnoreCase(param)) {
+ pullLatest3DayCommonOrder();
+ }
+ return ReturnT.SUCCESS;
+ }
+
+ // 娣樺疂鎺ㄥ箍璁㈠崟 姣忛殧1鍒嗘墽琛屼竴娆�
+ private void pullLatestCommonOrder() {
+ LogHelper.job("pullLatestCommonOrder");
+ Date systemDate = TaoKeApiUtil.getTaoBaoSystemTime();
+ long endTime = systemDate != null ? systemDate.getTime() : System.currentTimeMillis();
+ updateOrder(endTime - 1000 * 60 * 20L, endTime);
+ }
+
+ // 鐖彇鏈�杩戜竴澶╃殑甯歌璁㈠崟锛�30鍒嗛挓涓�娆★級
+ private void pullLatestDayCommonOrder() {
+ LogHelper.job("pullLatestCommonOrder");
+ Date systemDate = TaoKeApiUtil.getTaoBaoSystemTime();
+ long endTime = systemDate != null ? systemDate.getTime() : System.currentTimeMillis();
+ updateOrder(endTime - 1000 * 60 * 60 * 24L, endTime);
+ }
+
+ // 鐖彇鏈�杩戜笁澶╃殑甯歌璁㈠崟锛�6涓皬鏃朵竴娆★級
+ private void pullLatest3DayCommonOrder() {
+ LogHelper.job("pullLatestCommonOrder");
+ Date systemDate = TaoKeApiUtil.getTaoBaoSystemTime();
+ long endTime = systemDate != null ? systemDate.getTime() : System.currentTimeMillis();
+ updateOrder(endTime - 1000 * 60 * 60 * 24 * 3L, endTime);
+ }
+
+ // 5鍒嗛挓鎵ц涓�娆�
+ @XxlJob("ownBuyFanLiHandler")
+ public ReturnT<String> ownBuyFanLi(String param) throws Exception {
+ LogHelper.job("澶勭悊杩斿埄鍒拌处鍓嶇疆");
+ try {
+ doTaoBaoWeiQuanOrder(2);
+ } catch (Exception e) {
+ LogHelper.errorDetailInfo(e);
+ }
+ LogHelper.job("寮�濮嬪鐞嗚繑鍒�");
+ orderProcessService.fanli();
+ return ReturnT.SUCCESS;
+ }
+
+ @XxlJob("taoBaoWeiQuanOrderHandler")
+ public ReturnT<String> doTaoBaoWeiQuan(String param) throws Exception {
+ LogHelper.job("缁存潈璁㈠崟鐖彇");
+ doTaoBaoWeiQuanOrder(5);
+ return ReturnT.SUCCESS;
+ }
+
+ // 澶勭悊鎵惧洖璁㈠崟
+ @XxlJob("doLostOrderHandler")
+ public ReturnT<String> doLostOrder(String param) throws Exception {
+ if ("fail".equalsIgnoreCase(param)) {// 鏇存柊鏈�杩戠殑鏈湴鍗�(30鍒嗛挓鏇存柊涓�娆�)
+ doFailLostOrder();
+ } else if ("success".equalsIgnoreCase(param)) {// 澶勭悊鏈�杩�5澶╃殑鏈湴璁㈠崟
+ addLostOrder();
+ }
+ return ReturnT.SUCCESS;
+ }
+
+ // 澶勭悊璁㈠崟鎵惧洖澶辫触鐨勬儏鍐� 姣�6涓皬鏃舵墽琛屼竴娆�
+ private void doFailLostOrder() {
+ LogHelper.job("澶勭悊涓㈠け璁㈠崟鑷姩鎵惧洖澶辫触鐨勬儏鍐�");
+ lostOrderService.processFail();
+ }
+
+ // 姣�2鍒嗛挓鎵ц涓�娆�
+ private void addLostOrder() {
+ LogHelper.job("澶勭悊涓㈠け璁㈠崟");
+ 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 = RedisKeyEnum.getRedisKey(RedisKeyEnum.addOrderQueue, lo.getOrderId());
+
+ redisManager.removeCommonString(key);
+ addOrder(taoBaoOrderList);
+ LogHelper.test("鑷姩澶勭悊娣樺疂璁㈠崟:" + lo.getOrderId());
+ }
+ }
+ }
+
+ // 澶勭悊娣樺疂鏈湴璁㈠崟
+ @XxlJob("doLocalTaoBaoOrder")
+ public ReturnT<String> updatePDDOrder(String param) throws Exception {
+ if ("1".equalsIgnoreCase(param)) {// 鏇存柊鏈�杩戠殑鏈湴鍗�(30鍒嗛挓鏇存柊涓�娆�)
+ doLatestLocalTaoBaoOrder();
+ } else if ("5day".equalsIgnoreCase(param)) {// 澶勭悊鏈�杩�5澶╃殑鏈湴璁㈠崟
+ doLatest5DayLocalTaoBaoOrder();
+ }
+ return ReturnT.SUCCESS;
+ }
+
+ /**
+ * 鏇存柊鏈�杩戠殑鏈湴鍗�(30鍒嗛挓鏇存柊涓�娆�)
+ */
+ private void doLatestLocalTaoBaoOrder() {
+ Long endTime = System.currentTimeMillis() - 1000 * 60 * 10L;
+ Long startTime = endTime - 1000 * 60 * 60 * 12L;
+ updateLocalTaoBaoOrder(startTime, endTime, 1, 2000);
+ }
+
+ /**
+ * 澶勭悊鏈�杩�5澶╃殑鏈湴璁㈠崟
+ */
+ private void doLatest5DayLocalTaoBaoOrder() {
+ LogHelper.job("doLatest5DayLocalTaoBaoOrder");
Long endTime = System.currentTimeMillis() - 1000 * 60 * 60 * 12L;
Long startTime = endTime - 1000 * 60 * 60 * 24 * 5L;
long count = taoBaoOrderService.countBySettlementTime(startTime, endTime);
@@ -612,4 +479,28 @@
}
}
+ // 娣樺疂鍟嗗璺戣矾璁㈠崟 姣忔湀25鍙�12鐐瑰鐞嗕笂鏈堢殑
+ @XxlJob("doTaoBaoSellerNotPayOrderHandler")
+ public ReturnT<String> doSellerNotPayOrder(String param) throws Exception {
+ LogHelper.job("doSellerNotPayOrder");
+ Calendar calender = Calendar.getInstance();
+ long endTime = TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(calender.getTimeInMillis(), "yyyy-MM"),
+ "yyyy-MM");
+ calender.add(Calendar.MONTH, -1);
+ long startTime = TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(calender.getTimeInMillis(), "yyyy-MM"),
+ "yyyy-MM");
+ // 鍟嗗鏈粯娆�
+ List<TaoBaoOrder> orderList = taoBaoOrderService.listByStateAndCreateTime("璁㈠崟鎴愬姛", new Date(startTime),
+ new Date(endTime));
+
+ if (orderList != null)
+ for (TaoBaoOrder order : orderList)
+ try {
+ orderProcessService.doTaoBaoSellerNotPaid(order);
+ } catch (Exception e) {
+ LogHelper.errorDetailInfo(e);
+ }
+ return ReturnT.SUCCESS;
+ }
+
}
--
Gitblit v1.8.0