From 47618e991895749fd040f3b90b8504be3fd5376f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 15 四月 2020 16:11:42 +0800
Subject: [PATCH] 到账规则修改
---
fanli/src/main/java/com/yeshi/fanli/util/CMQManager.java | 63 ++++++++++++++++++++++---------
1 files changed, 44 insertions(+), 19 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 84993ed..2b2cb6e 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.mq.UidDateDTO;
import com.yeshi.fanli.dto.order.dividents.UserDividentsDayDTO;
import com.yeshi.fanli.entity.bus.user.AlipayTransferResultInfo;
import com.yeshi.fanli.entity.bus.user.Extract;
@@ -42,11 +43,11 @@
// 杩斿埄闃熷垪
public static String FANLI_ORDER_NEW = "fanli-order-new";
- // 鎻愭垚璁㈠崟
- public static String FANLI_TICHENG_ORDER = "fanli-ticheng-order";
+ // 鍥㈤槦鏀剁泭
+ public static String FANLI_TEAM_INCOME_ORDER = "fanli-team-income-order";
- // 鍥㈤槦濂栧姳鍒拌处
- public static String FANLI_ORDER_TEAM_REWARD = "fanli-order-team-reward";
+ // 鍒嗕韩璁㈠崟鏀剁泭
+ public static String FANLI_SHARE_ORDER = "fanli-team-income-order";
// 缁存潈璁㈠崟
public static String ORDER_WEIQUAN = "weiquan-order";
@@ -66,11 +67,11 @@
PUSH_IOS = "test-" + PUSH_IOS;
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;
+ FANLI_TEAM_INCOME_ORDER = "test-" + FANLI_TEAM_INCOME_ORDER;
ORDER_WEIQUAN = "test-" + ORDER_WEIQUAN;
IMPORTANT_GOODS_UPDATE = "test-" + IMPORTANT_GOODS_UPDATE;
TEAM_DIVIDENTS = "test-" + TEAM_DIVIDENTS;
+ FANLI_SHARE_ORDER = "test-" + FANLI_SHARE_ORDER;
}
QUEUENAME_ORDER += "-" + Constant.systemCommonConfig.getProjectName();
@@ -79,11 +80,11 @@
PUSH_IOS += "-" + Constant.systemCommonConfig.getProjectName();
FANLI_ORDER += "-" + Constant.systemCommonConfig.getProjectName();
FANLI_ORDER_NEW += "-" + Constant.systemCommonConfig.getProjectName();
- FANLI_TICHENG_ORDER += "-" + Constant.systemCommonConfig.getProjectName();
- FANLI_ORDER_TEAM_REWARD += "-" + Constant.systemCommonConfig.getProjectName();
+ FANLI_TEAM_INCOME_ORDER += "-" + Constant.systemCommonConfig.getProjectName();
ORDER_WEIQUAN += "-" + Constant.systemCommonConfig.getProjectName();
IMPORTANT_GOODS_UPDATE += "-" + Constant.systemCommonConfig.getProjectName();
TEAM_DIVIDENTS += "-" + Constant.systemCommonConfig.getProjectName();
+ FANLI_SHARE_ORDER += "-" + Constant.systemCommonConfig.getProjectName();
cmqUtil = CMQUtil.getInstance(secretId, secretKey);
// 鏈�澶ф秷鎭负1M
@@ -93,12 +94,12 @@
cmqUtil.createQueue(PUSH_IOS);
cmqUtil.createQueue(FANLI_ORDER);
cmqUtil.createQueue(FANLI_ORDER_NEW);
- cmqUtil.createQueue(FANLI_TICHENG_ORDER);
- cmqUtil.createQueue(FANLI_ORDER_TEAM_REWARD);
+ cmqUtil.createQueue(FANLI_TEAM_INCOME_ORDER);
cmqUtil.createQueue(ORDER_WEIQUAN);
cmqUtil.createQueue(GOODS_UPDATE);
cmqUtil.createQueue(IMPORTANT_GOODS_UPDATE);
cmqUtil.createQueue(TEAM_DIVIDENTS);
+ cmqUtil.createQueue(FANLI_SHARE_ORDER);
}
public static CMQManager getInstance() {
@@ -276,26 +277,50 @@
cmqUtil.deleteMsg(FANLI_ORDER_NEW, receiptHandle);
}
- // 鎻愭垚杩斿埄
- public void addFanLiTiChengMsg(Long uid) {
- cmqUtil.sendMsg(FANLI_TICHENG_ORDER, uid + "");
+ // 鍥㈤槦鏀剁泭
+ public void addFanLiTeamIncomeMsg(UidDateDTO dto) {
+ cmqUtil.sendMsg(FANLI_TEAM_INCOME_ORDER, new Gson().toJson(dto) + "");
}
- public Map<String, Long> consumeFanLiTiChengMsg(int count) {
- List<Message> list = cmqUtil.recieveMsg(count, FANLI_TICHENG_ORDER);
- Map<String, Long> map = new HashMap<>();
+ public Map<String, UidDateDTO> consumeFanLiTeamIncomeMsg(int count) {
+ List<Message> list = cmqUtil.recieveMsg(count, FANLI_TEAM_INCOME_ORDER);
+ Map<String, UidDateDTO> map = new HashMap<>();
if (list != null)
for (Message msg : list) {
String result = msg.msgBody;
+ UidDateDTO dto = new Gson().fromJson(result, UidDateDTO.class);
if (!StringUtil.isNullOrEmpty(result)) {
- map.put(msg.receiptHandle, Long.parseLong(result));
+ map.put(msg.receiptHandle, dto);
}
}
return map;
}
- public void deleteFanLiTiChengMsg(String receiptHandle) {
- cmqUtil.deleteMsg(FANLI_TICHENG_ORDER, receiptHandle);
+ public void deleteTeamIncomeMsg(String receiptHandle) {
+ cmqUtil.deleteMsg(FANLI_TEAM_INCOME_ORDER, receiptHandle);
+ }
+
+ // 鍒嗕韩璁㈠崟鏀剁泭
+ public void addFanLiShareMsg(UidDateDTO dto) {
+ cmqUtil.sendMsg(FANLI_SHARE_ORDER, new Gson().toJson(dto));
+ }
+
+ public Map<String, UidDateDTO> consumeFanLiShareMsg(int count) {
+ List<Message> list = cmqUtil.recieveMsg(count, FANLI_SHARE_ORDER);
+ Map<String, UidDateDTO> map = new HashMap<>();
+ if (list != null)
+ for (Message msg : list) {
+ String result = msg.msgBody;
+ UidDateDTO dto = new Gson().fromJson(result, UidDateDTO.class);
+ if (!StringUtil.isNullOrEmpty(result)) {
+ map.put(msg.receiptHandle, dto);
+ }
+ }
+ return map;
+ }
+
+ public void deleteFanLiShareMsg(String receiptHandle) {
+ cmqUtil.deleteMsg(FANLI_SHARE_ORDER, receiptHandle);
}
// 缁存潈璁㈠崟
--
Gitblit v1.8.0