From 4b80d2dab78d0cef3d149a0a11240b5e39b581a3 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 04 三月 2019 17:26:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java b/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
index 3b31512..5ccc1a5 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
@@ -64,10 +64,9 @@
@Resource
private QualityFactoryService qualityFactoryService;
-
+
@Resource
private UserSystemCouponService userSystemCouponService;
-
private static boolean isInited = false;
@@ -95,6 +94,7 @@
doOrderTiChengFanLi();// 澶勭悊璁㈠崟鎻愭垚杩斿埄
doWeiQuanOrder();// 澶勭悊缁存潈璁㈠崟
doPushIOS();// 澶勭悊鍙戦�両OS娑堟伅
+ doThreeSaleUserCouponJob();// 澶勭悊閭�璇烽槦鍒�
} else if (!Constant.IS_TEST) {
initScheduler();// 鍚姩瀹氭椂浠诲姟
// doUpdateGoodsJob();
@@ -420,7 +420,7 @@
ThreeSale threeSale = map.get(key);
if (threeSale != null) {
if (threeSale.getState() != null && threeSale.getState() == true) {
- // 閭�璇锋垚鍔� - 鍒告縺娲荤敓鏁�
+ // 閭�璇锋垚鍔� - 鍒告縺娲荤敓鏁�
Long bossId = threeSale.getBoss().getId();
userSystemCouponService.activatedWelfareFreeCoupon(bossId);
}
--
Gitblit v1.8.0