From 0f65eb854add4672cd6df87fb60423b57a471537 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期四, 14 二月 2019 11:18:59 +0800
Subject: [PATCH] 帮助中心分类
---
fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 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 c81c120..d45d399 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
@@ -12,9 +12,12 @@
import org.springframework.context.event.ContextRefreshedEvent;
import org.springframework.core.task.TaskExecutor;
import org.springframework.stereotype.Component;
+import org.yeshi.utils.tencentcloud.COSManager;
+import org.yeshi.utils.tencentcloud.entity.COSInitParams;
import com.yeshi.fanli.entity.bus.user.AlipayTransferResultInfo;
import com.yeshi.fanli.entity.bus.user.HongBao;
+import com.yeshi.fanli.entity.bus.user.HongBaoV2;
import com.yeshi.fanli.entity.push.PushQueueRecord;
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
@@ -27,8 +30,6 @@
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 org.yeshi.utils.tencentcloud.COSManager;
-import org.yeshi.utils.tencentcloud.entity.COSInitParams;
/**
* 绯荤粺鍒濆鍖�
@@ -85,13 +86,13 @@
if (Constant.IS_TASK) {
doExtractResult();// 澶勭悊鎻愮幇缁撴灉
doTaoBaoOrders();// 澶勭悊娣樺疂璁㈠崟
- doOrderFanLi();// 澶勭悊璁㈠崟杩斿埄
+ doOrderFanLiNew();// 鏂扮増杩斿埄
doOrderTiChengFanLi();// 澶勭悊璁㈠崟鎻愭垚杩斿埄
doWeiQuanOrder();// 澶勭悊缁存潈璁㈠崟
doPushIOS();// 澶勭悊鍙戦�両OS娑堟伅
} else if (!Constant.IS_TEST) {
initScheduler();// 鍚姩瀹氭椂浠诲姟
- doUpdateGoodsJob();
+ // doUpdateGoodsJob();
}
}
@@ -166,7 +167,11 @@
orderProcessService.processOrder(map);
}
} catch (Exception e) {
+ try {
+ LogHelper.errorDetailInfo(e);
+ } catch (Exception e1) {
+ }
}
}
}
@@ -175,22 +180,22 @@
}
/**
- * 澶勭悊娣樺疂璁㈠崟杩斿埄
+ * 澶勭悊鏂扮増娣樺疂璁㈠崟杩斿埄
*/
- public void doOrderFanLi() {
+ public void doOrderFanLiNew() {
executor.execute(new Runnable() {
@Override
public void run() {
while (true) {
try {
- Map<String, HongBao> map = CMQManager.getInstance().consumeFanLiMsg(16);
+ Map<String, HongBaoV2> map = CMQManager.getInstance().consumeFanLiMsgNew(16);
if (map != null) {
Iterator<String> its = map.keySet().iterator();
while (its.hasNext()) {
String handler = its.next();
try {
orderProcessService.fanli(map.get(handler));
- CMQManager.getInstance().deleteFanLiMsg(handler);
+ CMQManager.getInstance().deleteFanLiMsgNew(handler);
} catch (TaoBaoWeiQuanException e) {
try {
LogHelper.errorDetailInfo(e);
@@ -376,7 +381,7 @@
}
}
} catch (Exception e) {
- LogHelper.error("鏇存柊鍟嗗搧鍑洪敊:"+e.getMessage());
+ LogHelper.error("鏇存柊鍟嗗搧鍑洪敊:" + e.getMessage());
}
}
--
Gitblit v1.8.0