From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/CMQManager.java | 48 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 42 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..84993ed 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/CMQManager.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/CMQManager.java
@@ -12,6 +12,7 @@
import com.google.gson.GsonBuilder;
import com.qcloud.cmq.Message;
import com.yeshi.fanli.dto.HongBao;
+import com.yeshi.fanli.dto.order.dividents.UserDividentsDayDTO;
import com.yeshi.fanli.entity.bus.user.AlipayTransferResultInfo;
import com.yeshi.fanli.entity.bus.user.Extract;
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
@@ -24,7 +25,7 @@
private static String secretKey = "xhCSUHo55oHUQ6XicFcmfIgspX0EEzWo";
private static CMQManager cmqManager;
private static CMQUtil cmqUtil;
- // TODO 璁㈠崟澶勭悊闃熷垪
+ // 璁㈠崟澶勭悊闃熷垪
public static String QUEUENAME_ORDER = "fanli-orders";
// 鍒氬垰浜х敓鐨勮鍗曞鐞嗛槦鍒�
@@ -32,23 +33,29 @@
// 鎻愮幇缁撴灉澶勭悊闃熷垪
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";
// 閲嶈鏁版嵁鏇存柊
public static String IMPORTANT_GOODS_UPDATE = "imp_goods_update_queue";
+ // 鍥㈤槦鍒嗙孩
+ public static String TEAM_DIVIDENTS = "team_dividents";
static {
@@ -60,8 +67,10 @@
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;
+ TEAM_DIVIDENTS = "test-" + TEAM_DIVIDENTS;
}
QUEUENAME_ORDER += "-" + Constant.systemCommonConfig.getProjectName();
@@ -71,8 +80,10 @@
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();
+ TEAM_DIVIDENTS += "-" + Constant.systemCommonConfig.getProjectName();
cmqUtil = CMQUtil.getInstance(secretId, secretKey);
// 鏈�澶ф秷鎭负1M
@@ -83,9 +94,11 @@
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);
+ cmqUtil.createQueue(TEAM_DIVIDENTS);
}
public static CMQManager getInstance() {
@@ -434,4 +447,27 @@
cmqUtil.deleteMsg(IMPORTANT_GOODS_UPDATE, receiptHandle);
}
+ // 鍥㈤槦鍒嗙孩
+ public void addTeamDividentsMsg(UserDividentsDayDTO dto) {
+ cmqUtil.sendMsg(TEAM_DIVIDENTS, new Gson().toJson(dto));
+ }
+
+ public Map<String, UserDividentsDayDTO> consumeTeamDividentsMsg(int count) {
+ Gson gson = new Gson();
+ List<Message> list = cmqUtil.recieveMsg(count, TEAM_DIVIDENTS);
+ Map<String, UserDividentsDayDTO> map = new HashMap<>();
+ if (list != null)
+ for (Message msg : list) {
+ String result = msg.msgBody;
+ if (!StringUtil.isNullOrEmpty(result)) {
+ map.put(msg.receiptHandle, gson.fromJson(result, UserDividentsDayDTO.class));
+ }
+ }
+ return map;
+ }
+
+ public void deleteTeamDividentsMsg(String receiptHandle) {
+ cmqUtil.deleteMsg(TEAM_DIVIDENTS, receiptHandle);
+ }
+
}
--
Gitblit v1.8.0