From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/job/order/taobao/UpdateOrderJob.java |   27 +++++++++++++++++++--------
 1 files changed, 19 insertions(+), 8 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 a269c36..e1b6fbf 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;
@@ -26,6 +28,7 @@
 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.order.tb.TaoBaoOrderService;
@@ -33,6 +36,7 @@
 import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
 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.TimeUtil;
@@ -77,6 +81,9 @@
 
 	@Resource
 	private CommonOrderService commonOrderService;
+
+	@Resource
+	private OrderMoneySettleService orderMoneySettleService;
 
 	/**
 	 * 鏂扮増鑾峰彇鏅�氳鍗�
@@ -204,7 +211,7 @@
 				Iterator<String> its = map.keySet().iterator();
 				while (its.hasNext()) {
 					String key = its.next();
-					String redisKey = "addorderqueue-" + key;
+					String redisKey = RedisKeyEnum.getRedisKey(RedisKeyEnum.addOrderQueue, key);
 					// redis鍋氶鐜囬檺鍒�
 					try {
 						if (!StringUtil.isNullOrEmpty(redisManager.getCommonString(redisKey))) {
@@ -322,9 +329,9 @@
 	// 姣�15鍒嗛挓鐖彇涓�娆�
 	@Scheduled(cron = "0 0/15 * * * ? ")
 	public void pullCommonOrder() {
-		LogHelper.job("姝ｅ湪鎵ц15min璁㈠崟鐖彇");
 		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");
@@ -368,11 +375,14 @@
 	}
 
 	// 姣忔湀25鍙�9鐐规墽琛岃繑鍒�
-	@Scheduled(cron = "0 0 9 25 * ? ")
-	public void fanliInvaiteAndShare() {
-		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澶╃殑
@@ -407,7 +417,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());

--
Gitblit v1.8.0