From 565c0a03a299de5a619f4d5b5fe593e46dbf35dd Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 28 八月 2019 15:07:58 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 54 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 81d776d..e7d96d4 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
@@ -29,6 +29,7 @@
import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
import com.yeshi.fanli.exception.TaoBaoWeiQuanException;
import com.yeshi.fanli.log.LogHelper;
+import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service;
import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
import com.yeshi.fanli.service.inter.jd.JDOrderService;
import com.yeshi.fanli.service.inter.lable.BoutiqueAutoRuleService;
@@ -42,6 +43,7 @@
import com.yeshi.fanli.service.inter.user.ExtractService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
+import com.yeshi.fanli.util.cmq.HongBaoRecieveCMQManager;
import com.yeshi.fanli.util.cmq.JDOrderCMQManager;
import com.yeshi.fanli.util.cmq.PDDOrderCMQManager;
import com.yeshi.fanli.util.cmq.ThreeSaleCMQManager;
@@ -101,6 +103,9 @@
@Resource
private PDDOrderService pddOrderService;
+
+ @Resource
+ private HongBaoV2Service hongBaoV2Service;
private static boolean isInited = false;
@@ -686,4 +691,53 @@
}
+ /**
+ * 绾㈠寘鍒拌处鍚庣殑閲戝竵鑾峰彇
+ */
+ public void doHongBaoRecieveIntegralGetJob() {
+ executor.execute(new Runnable() {
+ @Override
+ public void run() {
+ while (true) {
+ Map<String, Long> map = HongBaoRecieveCMQManager.getInstance()
+ .consumeQueueMsg(HongBaoRecieveCMQManager.QUEUE_INTEGRAL, 16);
+ if (map != null) {
+ Iterator<String> its = map.keySet().iterator();
+ while (its.hasNext()) {
+ String key = its.next();
+ Long hongBaoId = map.get(key);
+ try {
+ HongBaoV2 hongBaoV2 = hongBaoV2Service.selectByPrimaryKey(hongBaoId);
+ if (hongBaoV2 != null && hongBaoV2.getState() == HongBaoV2.STATE_YILINGQU) {
+ if (hongBaoV2.getType() == HongBaoV2.TYPE_ZIGOU) {// 鑷喘
+ // TODO 娣诲姞鍔犻噾甯佷簨浠�
+ } else if (hongBaoV2.getType() == HongBaoV2.TYPE_SHARE_GOODS) {// 鍒嗕韩璧�
+ // TODO 娣诲姞鍔犻噾甯佷簨浠�
+ } else if (hongBaoV2.getType() == HongBaoV2.TYPE_YIJI
+ || hongBaoV2.getType() == HongBaoV2.TYPE_SHARE_YIJI) {// 涓�绾ч個璇疯禋
+ // TODO 娣诲姞鍔犻噾甯佷簨浠�
+ } else if (hongBaoV2.getType() == HongBaoV2.TYPE_ERJI
+ || hongBaoV2.getType() == HongBaoV2.TYPE_SHARE_ERJI) {// 浜岀骇閭�璇疯禋
+ // TODO 娣诲姞鍔犻噾甯佷簨浠�
+ }
+ }
+ HongBaoRecieveCMQManager.getInstance()
+ .deleteQueueMsg(HongBaoRecieveCMQManager.QUEUE_INTEGRAL, key);
+ } catch (Exception e) {
+ try {
+ LogHelper.errorDetailInfo(e);
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+ } finally {
+
+ }
+ }
+ }
+ }
+ }
+ });
+
+ }
+
}
--
Gitblit v1.8.0