From 86e46bc28e78b3a883132816e23dbcca37f9ca3a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 05 一月 2019 14:24:15 +0800
Subject: [PATCH] Merge branch 'dev-hongbao'
---
fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java | 46 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 44 insertions(+), 2 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 05fa705..245d597 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;
/**
* 绯荤粺鍒濆鍖�
@@ -220,6 +221,47 @@
}
/**
+ * 澶勭悊鏂扮増娣樺疂璁㈠崟杩斿埄
+ */
+ public void doOrderFanLiNew() {
+ executor.execute(new Runnable() {
+ @Override
+ public void run() {
+ while (true) {
+ try {
+ 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().deleteFanLiMsgNew(handler);
+ } catch (TaoBaoWeiQuanException e) {
+ try {
+ LogHelper.errorDetailInfo(e);
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+ } catch (Exception e) {
+ try {
+ LogHelper.errorDetailInfo(e);
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+ }
+ }
+ }
+
+ } catch (Exception e) {
+
+ }
+ }
+ }
+ });
+ }
+
+ /**
* 澶勭悊娣樺疂鎻愭垚璁㈠崟杩斿埄
*/
public void doOrderTiChengFanLi() {
--
Gitblit v1.8.0