From 88c7df1d5089d8e39f356a68eaccc18f308e190c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 24 三月 2020 12:10:07 +0800
Subject: [PATCH] Merge branch 'div' into div-1
---
fanli/src/main/java/com/yeshi/fanli/util/CMQManager.java | 46 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 40 insertions(+), 6 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 8d082d1..e891215 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/CMQManager.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/CMQManager.java
@@ -24,7 +24,7 @@
private static String secretKey = "xhCSUHo55oHUQ6XicFcmfIgspX0EEzWo";
private static CMQManager cmqManager;
private static CMQUtil cmqUtil;
- // TODO 璁㈠崟澶勭悊闃熷垪
+ // 璁㈠崟澶勭悊闃熷垪
public static String QUEUENAME_ORDER = "fanli-orders";
// 鍒氬垰浜х敓鐨勮鍗曞鐞嗛槦鍒�
@@ -32,18 +32,22 @@
// 鎻愮幇缁撴灉澶勭悊闃熷垪
public static String EXTRACT_RESULT = "extract-result";
- // TODO IOS鎺ㄩ�侀槦鍒�
+ // IOS鎺ㄩ�侀槦鍒�
public static String PUSH_IOS = "push-ios";
- // 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 缁存潈璁㈠崟
+
+ // 鍥㈤槦濂栧姳鍒拌处
+ public static String FANLI_ORDER_TEAM_REWARD="fanli-order-team-reward";
+
+ // 缁存潈璁㈠崟
public static String ORDER_WEIQUAN = "weiquan-order";
public static String GOODS_UPDATE = "goods_update_queue";
@@ -60,6 +64,9 @@
FANLI_ORDER = "test-" + FANLI_ORDER;
FANLI_ORDER_NEW = "test-" + FANLI_ORDER_NEW;
FANLI_TICHENG_ORDER = "test-" + FANLI_TICHENG_ORDER;
+
+ FANLI_ORDER_TEAM_REWARD = "test-" + FANLI_ORDER_TEAM_REWARD;
+
ORDER_WEIQUAN = "test-" + ORDER_WEIQUAN;
IMPORTANT_GOODS_UPDATE = "test-" + IMPORTANT_GOODS_UPDATE;
}
@@ -71,6 +78,8 @@
FANLI_ORDER += "-" + Constant.systemCommonConfig.getProjectName();
FANLI_ORDER_NEW += "-" + Constant.systemCommonConfig.getProjectName();
FANLI_TICHENG_ORDER += "-" + Constant.systemCommonConfig.getProjectName();
+ FANLI_ORDER_TEAM_REWARD += "-" + Constant.systemCommonConfig.getProjectName();
+
ORDER_WEIQUAN += "-" + Constant.systemCommonConfig.getProjectName();
IMPORTANT_GOODS_UPDATE += "-" + Constant.systemCommonConfig.getProjectName();
@@ -83,6 +92,7 @@
cmqUtil.createQueue(FANLI_ORDER);
cmqUtil.createQueue(FANLI_ORDER_NEW);
cmqUtil.createQueue(FANLI_TICHENG_ORDER);
+ cmqUtil.createQueue(FANLI_ORDER_TEAM_REWARD);
cmqUtil.createQueue(ORDER_WEIQUAN);
cmqUtil.createQueue(GOODS_UPDATE);
cmqUtil.createQueue(IMPORTANT_GOODS_UPDATE);
@@ -285,6 +295,30 @@
cmqUtil.deleteMsg(FANLI_TICHENG_ORDER, receiptHandle);
}
+
+
+ // 鍥㈤槦濂栧姳
+ public void addFanLiOrderTeamRewardMsg(Long uid) {
+ cmqUtil.sendMsg(FANLI_ORDER_TEAM_REWARD, uid + "");
+ }
+
+ public Map<String, Long> consumeOrderTeamRewardMsg(int count) {
+ List<Message> list = cmqUtil.recieveMsg(count, FANLI_ORDER_TEAM_REWARD);
+ Map<String, Long> map = new HashMap<>();
+ if (list != null)
+ for (Message msg : list) {
+ String result = msg.msgBody;
+ if (!StringUtil.isNullOrEmpty(result)) {
+ map.put(msg.receiptHandle, Long.parseLong(result));
+ }
+ }
+ return map;
+ }
+
+ public void deleteOrderTeamRewardMsg(String receiptHandle) {
+ cmqUtil.deleteMsg(FANLI_ORDER_TEAM_REWARD, receiptHandle);
+ }
+
// 缁存潈璁㈠崟
public void addWeiQuanOrderMsg(TaoBaoWeiQuanOrder order) {
cmqUtil.sendMsg(ORDER_WEIQUAN, new Gson().toJson(order));
--
Gitblit v1.8.0