From f15acf7f2d57db3a32c574b0dfc21f564dca6024 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 24 三月 2020 12:01:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/job/order/taobao/UpdateOrderJob.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 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 d30cc62..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;
@@ -80,6 +81,9 @@
@Resource
private CommonOrderService commonOrderService;
+
+ @Resource
+ private OrderMoneySettleService orderMoneySettleService;
/**
* 鏂扮増鑾峰彇鏅�氳鍗�
@@ -381,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 * * * ? ")
--
Gitblit v1.8.0