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/CMQManager.java | 38 ++++++++++++++++++++++++++++++++++++--
1 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/CMQManager.java b/fanli/src/main/java/com/yeshi/fanli/util/CMQManager.java
index 5c4cc2e..bcdcece 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/CMQManager.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/CMQManager.java
@@ -6,7 +6,7 @@
import java.util.List;
import java.util.Map;
-import net.sf.json.JSONObject;
+import org.yeshi.utils.CMQUtil;
import com.alipay.api.response.AlipayFundTransToaccountTransferResponse;
import com.google.gson.Gson;
@@ -16,11 +16,13 @@
import com.yeshi.fanli.entity.bus.user.AlipayTransferResultInfo;
import com.yeshi.fanli.entity.bus.user.Extract;
import com.yeshi.fanli.entity.bus.user.HongBao;
+import com.yeshi.fanli.entity.bus.user.HongBaoV2;
import com.yeshi.fanli.entity.common.AdminUser;
import com.yeshi.fanli.entity.push.PushQueueRecord;
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
-import org.yeshi.utils.CMQUtil;
+
+import net.sf.json.JSONObject;
public class CMQManager {
private static String secretId = "AKIDTlpgJhLjOozvd6QI2XnpfGbgV4NQJk25";
@@ -36,6 +38,10 @@
// TODO 杩斿埄闃熷垪
public static String FANLI_ORDER = "fanli-order";
+
+ // TODO 杩斿埄闃熷垪
+ public static String FANLI_ORDER_NEW = "fanli-order-new";
+
// TODO 鎻愭垚璁㈠崟
public static String FANLI_TICHENG_ORDER = "fanli-ticheng-order";
// TODO 缁存潈璁㈠崟
@@ -48,6 +54,7 @@
EXTRACT_RESULT += "-" + Constant.systemCommonConfig.getProjectName();
PUSH_IOS += "-" + Constant.systemCommonConfig.getProjectName();
FANLI_ORDER += "-" + Constant.systemCommonConfig.getProjectName();
+ FANLI_ORDER_NEW += "-" + Constant.systemCommonConfig.getProjectName();
FANLI_TICHENG_ORDER += "-" + Constant.systemCommonConfig.getProjectName();
ORDER_WEIQUAN += "-" + Constant.systemCommonConfig.getProjectName();
@@ -57,6 +64,7 @@
cmqUtil.createQueue(EXTRACT_RESULT);
cmqUtil.createQueue(PUSH_IOS);
cmqUtil.createQueue(FANLI_ORDER);
+ cmqUtil.createQueue(FANLI_ORDER_NEW);
cmqUtil.createQueue(FANLI_TICHENG_ORDER);
cmqUtil.createQueue(ORDER_WEIQUAN);
cmqUtil.createQueue(GOODS_UPDATE);
@@ -167,6 +175,12 @@
cmqUtil.sendMsg(FANLI_ORDER, content);
}
+ // 鏂扮増璁㈠崟杩斿埄
+ public void addFanLiMsgNew(HongBaoV2 hongBao) {
+ String content = new Gson().toJson(hongBao);
+ cmqUtil.sendMsg(FANLI_ORDER_NEW, content);
+ }
+
public Map<String, HongBao> consumeFanLiMsg(int count) {
List<Message> list = cmqUtil.recieveMsg(count, FANLI_ORDER);
Map<String, HongBao> map = new HashMap<>();
@@ -180,10 +194,30 @@
}
return map;
}
+
+
+ public Map<String, HongBaoV2> consumeFanLiMsgNew(int count) {
+ List<Message> list = cmqUtil.recieveMsg(count, FANLI_ORDER_NEW);
+ Map<String, HongBaoV2> map = new HashMap<>();
+ if (list != null)
+ for (Message msg : list) {
+ String result = msg.msgBody;
+ if (!StringUtil.isNullOrEmpty(result)) {
+ HongBaoV2 hongBao = new Gson().fromJson(result, HongBaoV2.class);
+ map.put(msg.receiptHandle, hongBao);
+ }
+ }
+ return map;
+ }
+
public void deleteFanLiMsg(String receiptHandle) {
cmqUtil.deleteMsg(FANLI_ORDER, receiptHandle);
}
+
+ public void deleteFanLiMsgNew(String receiptHandle) {
+ cmqUtil.deleteMsg(FANLI_ORDER_NEW, receiptHandle);
+ }
// 鎻愭垚杩斿埄
public void addFanLiTiChengMsg(Long uid) {
--
Gitblit v1.8.0