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 | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 57 insertions(+), 0 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 a77f401..5ccc1a5 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
@@ -17,6 +17,7 @@
import com.yeshi.fanli.entity.bus.user.AlipayTransferResultInfo;
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
+import com.yeshi.fanli.entity.bus.user.ThreeSale;
import com.yeshi.fanli.entity.push.PushQueueRecord;
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
@@ -29,6 +30,7 @@
import com.yeshi.fanli.service.inter.push.IOSPushService;
import com.yeshi.fanli.service.inter.user.ExtractService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
+import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
/**
* 绯荤粺鍒濆鍖�
@@ -63,6 +65,9 @@
@Resource
private QualityFactoryService qualityFactoryService;
+ @Resource
+ private UserSystemCouponService userSystemCouponService;
+
private static boolean isInited = false;
public void onApplicationEvent(ContextRefreshedEvent arg0) {
@@ -89,6 +94,7 @@
doOrderTiChengFanLi();// 澶勭悊璁㈠崟鎻愭垚杩斿埄
doWeiQuanOrder();// 澶勭悊缁存潈璁㈠崟
doPushIOS();// 澶勭悊鍙戦�両OS娑堟伅
+ doThreeSaleUserCouponJob();// 澶勭悊閭�璇烽槦鍒�
} else if (!Constant.IS_TEST) {
initScheduler();// 鍚姩瀹氭椂浠诲姟
// doUpdateGoodsJob();
@@ -386,6 +392,57 @@
}
}
});
+ }
+
+ /**
+ * 閭�璇峰叧绯诲彉鍖栧悗鍒哥殑鏇存柊
+ */
+ public void doThreeSaleUserCouponJob() {
+
+ // 閲囩敤2涓嚎绋嬪仛鏇存柊
+ for (int i = 0; i < 2; i++)
+ executor.execute(new Runnable() {
+ @Override
+ public void run() {
+
+ while (true) {
+ try {
+
+ Map<String, ThreeSale> map = ThreeSaleCMQManager.getInstance()
+ .consumeQueueMsg(ThreeSaleCMQManager.QUEUE_USER_COUPON, 16);
+
+ if (map != null) {
+
+ Iterator<String> its = map.keySet().iterator();
+ while (its.hasNext()) {
+ String key = its.next();
+ try {
+ ThreeSale threeSale = map.get(key);
+ if (threeSale != null) {
+ if (threeSale.getState() != null && threeSale.getState() == true) {
+ // 閭�璇锋垚鍔� - 鍒告縺娲荤敓鏁�
+ Long bossId = threeSale.getBoss().getId();
+ userSystemCouponService.activatedWelfareFreeCoupon(bossId);
+ }
+ }
+ ThreeSaleCMQManager.getInstance()
+ .deleteQueueMsg(ThreeSaleCMQManager.QUEUE_USER_COUPON, key);
+ } catch (Exception e) {
+ try {
+ LogHelper.errorDetailInfo(e);
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+ }
+ }
+ }
+ } catch (Exception e) {
+ LogHelper.error("鏇存柊鍟嗗搧鍑洪敊:" + e.getMessage());
+
+ }
+ }
+ }
+ });
}
}
--
Gitblit v1.8.0