From f4a0f2acc63d7785eab108419a4e16f5f688cb95 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 18 一月 2020 12:06:27 +0800
Subject: [PATCH] 用户注册信息
---
fanli/src/main/java/com/yeshi/fanli/job/order/taobao/UpdateOrderJob.java | 384 +++++++++++++++++++++++++-----------------------------
1 files changed, 176 insertions(+), 208 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 977c797..d30cc62 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
@@ -16,6 +16,8 @@
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;
@@ -28,16 +30,17 @@
import com.yeshi.fanli.service.inter.order.LostOrderService;
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;
//浠庢窐瀹濈埇鍘昏鍗曟洿鏂�
@@ -86,39 +89,8 @@
* @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,
- TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
- while (orderList.size() == 100 * page) {
- page++;
- List<TaoBaoOrder> tempOrderList = TaoKeOrderApiUtil.getTaoBaoAllOrder(startTimeStr, span, page,
- TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
- if (tempOrderList != null && tempOrderList.size() > 0)
- orderList.addAll(tempOrderList);
- }
- return 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,
- TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
- while (orderList.size() == 100 * page) {
- page++;
- List<TaoBaoOrder> tempOrderList = TaoKeOrderApiUtil.getTaoBaoThirdAllOrder(startTimeStr, span, page,
- TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
- if (tempOrderList != null && tempOrderList.size() > 0)
- orderList.addAll(tempOrderList);
- }
+ List<TaoBaoOrder> orderList = TaoKeOrderApiUtil.getTaoBaoCommonOrderList(startTime, startTime + span * 1000L,
+ 1);
return orderList;
}
@@ -130,51 +102,7 @@
* @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;
- }
-
- /**
- * 鐖彇涓夋柟璁㈠崟
- *
- * @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);
- }
+ List<TaoBaoOrder> orderList = TaoKeOrderApiUtil.getTaoBaoCommonOrderList(startTime, endTime, 1);
return orderList;
}
@@ -196,40 +124,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 +174,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("娓犻亾涓撳睘")) {
@@ -302,7 +199,6 @@
taoBaoOrderService.addTaoBaoOrderList(orderList);
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
-
}
try {
@@ -311,8 +207,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))) {
@@ -338,11 +233,101 @@
}
}
+ private void doTaoBaoWeiQuanOrder(int day) {
+
+ for (int i = 0; i < day; i++) {
+ List<TaoBaoWeiQuanOrder> orderList = new ArrayList<>();
+
+ // 鎸夌収缁存潈鍙戣捣鏃堕棿鏌ヨ
+ WeiQuanOrderResult result = TaoKeOrderApiUtil
+ .getTaoBaoSpecialWeiQuanOrderList(new Date(TimeUtil.convertToTimeTemp(
+ TimeUtil.getGernalTime(System.currentTimeMillis() - 1000 * 60 * 60 * 24L * i, "yyyy-MM-dd"),
+ "yyyy-MM-dd")), 1, 1, false);
+ orderList.addAll(result.orderList);
+ // 绗笁鏂�
+ result = TaoKeOrderApiUtil.getTaoBaoSpecialWeiQuanOrderList(new Date(TimeUtil.convertToTimeTemp(
+ TimeUtil.getGernalTime(System.currentTimeMillis() - 1000 * 60 * 60 * 24L * i, "yyyy-MM-dd"),
+ "yyyy-MM-dd")), 1, 1, true);
+ orderList.addAll(result.orderList);
+
+ result = TaoKeOrderApiUtil.getTaoBaoRelationWeiQuanOrderList(new Date(TimeUtil.convertToTimeTemp(
+ TimeUtil.getGernalTime(System.currentTimeMillis() - 1000 * 60 * 60 * 24L * i, "yyyy-MM-dd"),
+ "yyyy-MM-dd")), 1, 1, false);
+ orderList.addAll(result.orderList);
+
+ // 绗笁鏂�
+ result = TaoKeOrderApiUtil.getTaoBaoRelationWeiQuanOrderList(new Date(TimeUtil.convertToTimeTemp(
+ TimeUtil.getGernalTime(System.currentTimeMillis() - 1000 * 60 * 60 * 24L * i, "yyyy-MM-dd"),
+ "yyyy-MM-dd")), 1, 1, true);
+ orderList.addAll(result.orderList);
+
+ /**
+ * 鎸夌収缁存潈瀹屾垚鏃堕棿鏌ヨ
+ */
+
+ result = TaoKeOrderApiUtil.getTaoBaoSpecialWeiQuanOrderList(new Date(TimeUtil.convertToTimeTemp(
+ TimeUtil.getGernalTime(System.currentTimeMillis() - 1000 * 60 * 60 * 24L * i, "yyyy-MM-dd"),
+ "yyyy-MM-dd")), 3, 1, false);
+ orderList.addAll(result.orderList);
+ // 绗笁鏂�
+ result = TaoKeOrderApiUtil.getTaoBaoSpecialWeiQuanOrderList(new Date(TimeUtil.convertToTimeTemp(
+ TimeUtil.getGernalTime(System.currentTimeMillis() - 1000 * 60 * 60 * 24L * i, "yyyy-MM-dd"),
+ "yyyy-MM-dd")), 3, 1, true);
+ orderList.addAll(result.orderList);
+
+ result = TaoKeOrderApiUtil.getTaoBaoRelationWeiQuanOrderList(new Date(TimeUtil.convertToTimeTemp(
+ TimeUtil.getGernalTime(System.currentTimeMillis() - 1000 * 60 * 60 * 24L * i, "yyyy-MM-dd"),
+ "yyyy-MM-dd")), 3, 1, false);
+ orderList.addAll(result.orderList);
+
+ // 绗笁鏂�
+ result = TaoKeOrderApiUtil.getTaoBaoRelationWeiQuanOrderList(new Date(TimeUtil.convertToTimeTemp(
+ TimeUtil.getGernalTime(System.currentTimeMillis() - 1000 * 60 * 60 * 24L * i, "yyyy-MM-dd"),
+ "yyyy-MM-dd")), 3, 1, true);
+ orderList.addAll(result.orderList);
+
+ for (TaoBaoWeiQuanOrder order : orderList)
+ taoBaoWeiQuanOrderService.addWeiQuanOrder(order);// 娣诲姞缁存潈璁㈠崟鍒版暟鎹簱
+ // 澶勭悊缁存潈璁㈠崟
+ orderProcessService.weiQuanOrder(orderList);
+ }
+
+ }
+
+ 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();
+ // 鏌ヨ鏄惁鏈夊浜庤鍗曚粯娆剧姸鎬佺殑鍗�
+ List<CommonOrder> commonOrderList = commonOrderService
+ .listBySourceTypeAndOrderId(Constant.SOURCE_TYPE_TAOBAO, orderId);
+ boolean update = false;
+ if (commonOrderList != null)
+ for (CommonOrder co : commonOrderList) {
+ if (co.getState() == CommonOrder.STATE_FK && co.getPayment().compareTo(new BigDecimal(0)) > 0) {
+ update = true;
+ break;
+ }
+ }
+ if (update) {
+ List<TaoBaoOrder> orderList = taoBaoOrderService.getTaoBaoOrderByOrderId(orderId);
+ Map<String, List<TaoBaoOrder>> orders = new HashMap<>();
+ orders.put(orderId, orderList);
+ orderProcessService.processOrder(orders);
+ }
+ }
+ }
+
// 姣�15鍒嗛挓鐖彇涓�娆�
@Scheduled(cron = "0 0/15 * * * ? ")
- public void doJob1() {
+ public void pullCommonOrder() {
if (!Constant.IS_TASK)
return;
+ LogHelper.job("姝ｅ湪鎵ц15min璁㈠崟鐖彇");
long currentTime = System.currentTimeMillis() - 1000 * 60;
String h = TimeUtil.getGernalTime(currentTime, "HH");
String m = TimeUtil.getGernalTime(currentTime, "mm");
@@ -353,36 +338,47 @@
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() {
+ // 娣樺疂鎺ㄥ箍璁㈠崟 姣忛殧1鍒嗘墽琛屼竴娆�
+ @Scheduled(cron = "0 0/1 * * * ? ")
+ public void pullLatestCommonOrder() {
if (!Constant.IS_TASK)
return;
- long endTime = System.currentTimeMillis() - 1000 * 60;
- ;
+ LogHelper.job("pullLatestCommonOrder");
+ Date systemDate = TaoKeApiUtil.getTaoBaoSystemTime();
+ long endTime = systemDate != null ? systemDate.getTime() : System.currentTimeMillis();
+ //
updateOrder(endTime - 1000 * 60 * 20L, endTime);
}
// 杩斿埄
@Scheduled(cron = "0 0/5 * * * ? ")
- public void doJob2() {
+ public void fanli() {
if (!Constant.IS_TASK)
return;
- doTaoBaoWeiQuan();
+ LogHelper.job("澶勭悊杩斿埄鍒拌处鍓嶇疆");
+ try {
+ doTaoBaoWeiQuanOrder(2);
+ } catch (Exception e) {
+ LogHelper.errorDetailInfo(e);
+ }
+ LogHelper.job("寮�濮嬪鐞嗚繑鍒�");
orderProcessService.fanli();
}
// 姣忔湀25鍙�9鐐规墽琛岃繑鍒�
- @Scheduled(cron = "0 0 9 25 * ? ")
- public void doJob3() {
- if (!Constant.IS_TASK)
- return;
- orderProcessService.fanliInvaiteAndShare();
+ // @Scheduled(cron = "0 0 9 25 * ? ")
+ @XxlJob("fanliInvaiteAndShareHandler")
+ public ReturnT<String> fanliInvaiteAndShareHandler(String param) throws Exception {
+ if (StringUtil.isNullOrEmpty(param))
+ orderProcessService.fanliInvaiteAndShare();
+ else
+ orderProcessService.fanliInvaiteAndShare(Long.parseLong(param));
+ return ReturnT.SUCCESS;
}
// 缁存潈璁㈠崟澶勭悊-澶勭悊鏈�杩�60澶╃殑
@@ -391,42 +387,16 @@
public void doTaoBaoWeiQuan() {
if (!Constant.IS_TASK)
return;
- // 鏂扮増缁存潈璁㈠崟澶勭悊
- for (int i = 0; i < 60; i++) {
- List<TaoBaoWeiQuanOrder> orderList = new ArrayList<>();
- WeiQuanOrderResult result = TaoKeOrderApiUtil
- .getTaoBaoSpecialWeiQuanOrderList(new Date(TimeUtil.convertToTimeTemp(
- TimeUtil.getGernalTime(System.currentTimeMillis() - 1000 * 60 * 60 * 24L * i, "yyyy-MM-dd"),
- "yyyy-MM-dd")), 1, false);
- orderList.addAll(result.orderList);
-
- result = TaoKeOrderApiUtil.getTaoBaoSpecialWeiQuanOrderList(new Date(TimeUtil.convertToTimeTemp(
- TimeUtil.getGernalTime(System.currentTimeMillis() - 1000 * 60 * 60 * 24L * i, "yyyy-MM-dd"),
- "yyyy-MM-dd")), 1, true);
- orderList.addAll(result.orderList);
-
- result = TaoKeOrderApiUtil.getTaoBaoRelationWeiQuanOrderList(new Date(TimeUtil.convertToTimeTemp(
- TimeUtil.getGernalTime(System.currentTimeMillis() - 1000 * 60 * 60 * 24L * i, "yyyy-MM-dd"),
- "yyyy-MM-dd")), 1, false);
- orderList.addAll(result.orderList);
-
- result = TaoKeOrderApiUtil.getTaoBaoRelationWeiQuanOrderList(new Date(TimeUtil.convertToTimeTemp(
- TimeUtil.getGernalTime(System.currentTimeMillis() - 1000 * 60 * 60 * 24L * i, "yyyy-MM-dd"),
- "yyyy-MM-dd")), 1, true);
- orderList.addAll(result.orderList);
-
- for (TaoBaoWeiQuanOrder order : orderList)
- taoBaoWeiQuanOrderService.addWeiQuanOrder(order);// 娣诲姞缁存潈璁㈠崟鍒版暟鎹簱
- // 澶勭悊缁存潈璁㈠崟
- orderProcessService.weiQuanOrder(orderList);
- }
+ LogHelper.job("缁存潈璁㈠崟鐖彇");
+ doTaoBaoWeiQuanOrder(5);
}
- // 姣�6涓皬鏃舵墽琛屼竴娆�
+ // 澶勭悊璁㈠崟鎵惧洖澶辫触鐨勬儏鍐� 姣�6涓皬鏃舵墽琛屼竴娆�
@Scheduled(cron = "0 0 0/6 * * ? ")
- public void doLostOrder() {
+ public void doFailLostOrder() {
if (!Constant.IS_TASK)
return;
+ LogHelper.job("澶勭悊涓㈠け璁㈠崟鑷姩鎵惧洖澶辫触鐨勬儏鍐�");
lostOrderService.processFail();
}
@@ -435,7 +405,7 @@
public void addLostOrder() {
if (!Constant.IS_TASK)
return;
- LogHelper.test("澶勭悊涓㈠け璁㈠崟");
+ LogHelper.job("澶勭悊涓㈠け璁㈠崟");
List<LostOrder> list = lostOrderService.listByStateAndResultCode(LostOrder.STATE_PASS,
LostOrder.RESULT_CODE_VERFING, 1, 50);
if (list != null)
@@ -443,7 +413,8 @@
List<TaoBaoOrder> taoBaoOrderList = taoBaoOrderService.getTaoBaoOrderByOrderId(lo.getOrderId());
// 娓呴櫎棰戠巼闄愬埗
if (taoBaoOrderList != null && taoBaoOrderList.size() > 0) {
- String key = "addorderqueue-" + lo.getOrderId();
+ String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.addOrderQueue, lo.getOrderId());
+
redisManager.removeCommonString(key);
addOrder(taoBaoOrderList);
LogHelper.test("鑷姩澶勭悊娣樺疂璁㈠崟:" + lo.getOrderId());
@@ -452,42 +423,37 @@
}
/**
- * 澶勭悊娣樺疂缁撶畻璁㈠崟,30fen鎵ц涓�娆�
+ * 澶勭悊娣樺疂缁撶畻璁㈠崟,30鍒嗘墽琛屼竴娆�
*/
@Scheduled(cron = "30 0 0/1 * * ? ")
public void doSettleOrders() {
if (!Constant.IS_TASK)
return;
+ LogHelper.job("doSettleOrders");
// 澶勭悊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);
+ List<TaoBaoOrder> orderList = TaoKeOrderApiUtil.getTaoBaoCommonOrderList(startTime, endTime, 3);
addOrder(orderList);
}
/**
- * 13鍒嗛挓鏇存柊鏈�杩�13鍒嗛挓鐨勭粨绠楁暟鎹�
+ * 13鍒嗛挓鏇存柊鏈�杩�2灏忔椂鐨勭粨绠楁暟鎹�
*/
@Scheduled(cron = "0 0/13 * * * ? ")
public void doSettleOrdersToday() {
if (!Constant.IS_TASK)
return;
+ LogHelper.job("doSettleOrdersToday");
// 澶勭悊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);
+ long startTime = ca.getTimeInMillis() - 1000 * 60 * 5L - 1000 * 60 * 60 * 2L;
+ long endTime = startTime + 1000 * 60 * 60 * 2L;
+ List<TaoBaoOrder> orderList = TaoKeOrderApiUtil.getTaoBaoCommonOrderList(startTime, endTime, 3);
addOrder(orderList);
}
@@ -498,6 +464,7 @@
public void doLocalTaoBaoOrder() {
if (!Constant.IS_TASK)
return;
+ LogHelper.job("doLocalTaoBaoOrder");
// 澶勭悊3-15澶╁墠鐨勮鍗曪紝姣忓ぉ璺戜竴娆�
Long startTime = System.currentTimeMillis() - 1000 * 60 * 60 * 24 * 60L;
Long endTime = startTime + 1000 * 60 * 60 * 24 * 48L;
@@ -525,46 +492,20 @@
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();
- // 鏌ヨ鏄惁鏈夊浜庤鍗曚粯娆剧姸鎬佺殑鍗�
- List<CommonOrder> commonOrderList = commonOrderService
- .listBySourceTypeAndOrderId(Constant.SOURCE_TYPE_TAOBAO, orderId);
- boolean update = false;
- if (commonOrderList != null)
- for (CommonOrder co : commonOrderList) {
- if (co.getState() == CommonOrder.STATE_FK && co.getPayment().compareTo(new BigDecimal(0)) > 0) {
- update = true;
- break;
- }
- }
-
- if (update) {
- List<TaoBaoOrder> orderList = taoBaoOrderService.getTaoBaoOrderByOrderId(orderId);
- Map<String, List<TaoBaoOrder>> orders = new HashMap<>();
- orders.put(orderId, orderList);
- orderProcessService.processOrder(orders);
- }
- }
- }
-
+ /**
+ * 澶勭悊鏈�杩�5澶╃殑鏈湴璁㈠崟
+ */
@Scheduled(cron = "30 13 3 * * ? ")
public void doLatest5DayLocalTaoBaoOrder() {
if (!Constant.IS_TASK)
return;
+ 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);
@@ -575,4 +516,31 @@
}
}
+ /**
+ * 澶勭悊涓婃湀璁㈠崟鎴愬姛
+ */
+ @Scheduled(cron = "0 0 12 25 * ? ")
+ public void doSellerNotPayOrder() {
+ if (!Constant.IS_TASK)
+ return;
+ 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);
+ }
+ }
+
}
--
Gitblit v1.8.0