From 3a6e476b2f498e876ff10f1328455f58e63ee85a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 04 四月 2019 09:30:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 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 def3250..d4a6051 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
@@ -99,9 +99,10 @@
doWeiQuanOrder();// 澶勭悊缁存潈璁㈠崟
doPushIOS();// 澶勭悊鍙戦�両OS娑堟伅
doThreeSaleUserCouponJob();// 澶勭悊閭�璇烽槦鍒�
+ doUpdateGoodsJob();
} else if (!Constant.IS_TEST) {
initScheduler();// 鍚姩瀹氭椂浠诲姟
- // doUpdateGoodsJob();
+ //
}
}
@@ -255,7 +256,7 @@
}
} catch (Exception e) {
try {
- LogHelper.errorDetailInfo(e);
+ LogHelper.errorDetailInfo(e, map.get(handler).toString(), "");
} catch (Exception e1) {
e1.printStackTrace();
}
@@ -411,10 +412,8 @@
while (true) {
try {
-
Map<String, ThreeSale> map = ThreeSaleCMQManager.getInstance()
.consumeQueueMsg(ThreeSaleCMQManager.QUEUE_USER_COUPON, 16);
-
if (map != null) {
Iterator<String> its = map.keySet().iterator();
@@ -427,9 +426,16 @@
if (threeSale != null) {
if (threeSale.getState() != null && threeSale.getState() == true) {
// 閭�璇锋垚鍔� - 鍒告縺娲荤敓鏁�
- LogHelper.test("doThreeSaleUserCouponJob-"+threeSale.getId());
+ LogHelper.test("doThreeSaleUserCouponJob-" + threeSale.getId());
+
Long bossId = threeSale.getBoss().getId();
- userSystemCouponService.activatedWelfareFreeCoupon(bossId);
+ // 涓嬬骇鏄电О
+
+ String workerNickName = userInfoService
+ .selectByPKey(threeSale.getWorker().getId()).getNickName();
+
+ userSystemCouponService.activatedWelfareFreeCoupon(bossId,
+ workerNickName);
}
}
ThreeSaleCMQManager.getInstance()
--
Gitblit v1.8.0