From 393e3a365b5ebbed6e9eef07fbd18881cde73711 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 28 三月 2020 16:51:04 +0800
Subject: [PATCH] Merge branch 'div' into div-1
---
fanli/src/main/java/com/yeshi/fanli/job/order/taobao/UpdateOrderJob.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 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 f2922b2..9a4e9e3 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
@@ -28,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;
@@ -35,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;
@@ -79,6 +81,9 @@
@Resource
private CommonOrderService commonOrderService;
+
+ @Resource
+ private OrderMoneySettleService orderMoneySettleService;
/**
* 鏂扮増鑾峰彇鏅�氳鍗�
@@ -206,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))) {
@@ -380,6 +385,18 @@
return ReturnT.SUCCESS;
}
+ // 鍥㈤槦濂栧姳鍒拌处
+ @XxlJob("fanliOrderTeamRewardHandler")
+ public ReturnT<String> fanliOrderTeamRewardHandler(String param) throws Exception {
+ if (StringUtil.isNullOrEmpty(param))
+ orderProcessService.fanliOrderTeamReward();
+ else {
+ orderProcessService.fanliOrderTeamReward(Long.parseLong(param));
+ }
+
+ return ReturnT.SUCCESS;
+ }
+
// 缁存潈璁㈠崟澶勭悊-澶勭悊鏈�杩�60澶╃殑
// 30鍒嗛挓涓�娆�
@Scheduled(cron = "0 0/30 * * * ? ")
@@ -412,7 +429,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