From 271ae63c20fcbe28d29c47f1881138ff6551a2a1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 10 六月 2020 19:26:26 +0800
Subject: [PATCH] 唯品会订单bug修复，APP端佣金比例展示错误bug修复
---
fanli/src/main/java/com/yeshi/fanli/util/CMQManager.java | 73 ++++++++++++------------------------
1 files changed, 24 insertions(+), 49 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..f177b3e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/CMQManager.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/CMQManager.java
@@ -8,11 +8,12 @@
import org.yeshi.utils.CMQUtil;
import com.alipay.api.response.AlipayFundTransToaccountTransferResponse;
+import com.alipay.api.response.AlipayFundTransUniTransferResponse;
import com.google.gson.Gson;
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.dto.mq.UidDateDTO;
import com.yeshi.fanli.entity.bus.user.AlipayTransferResultInfo;
import com.yeshi.fanli.entity.bus.user.Extract;
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
@@ -42,11 +43,10 @@
// 杩斿埄闃熷垪
public static String FANLI_ORDER_NEW = "fanli-order-new";
- // 鎻愭垚璁㈠崟
- public static String FANLI_TICHENG_ORDER = "fanli-ticheng-order";
- // 鍥㈤槦濂栧姳鍒拌处
- public static String FANLI_ORDER_TEAM_REWARD = "fanli-order-team-reward";
+
+ // 鍒嗕韩璁㈠崟鏀剁泭
+ public static String FANLI_SHARE_ORDER = "fanli-share-order";
// 缁存潈璁㈠崟
public static String ORDER_WEIQUAN = "weiquan-order";
@@ -54,8 +54,6 @@
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 {
@@ -66,11 +64,10 @@
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;
+
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 +76,9 @@
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();
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 +88,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(ORDER_WEIQUAN);
cmqUtil.createQueue(GOODS_UPDATE);
cmqUtil.createQueue(IMPORTANT_GOODS_UPDATE);
- cmqUtil.createQueue(TEAM_DIVIDENTS);
+
+ cmqUtil.createQueue(FANLI_SHARE_ORDER);
}
public static CMQManager getInstance() {
@@ -191,7 +186,7 @@
* @param extract
* @param response
*/
- public void addExtractResultMsg(Extract extract, AlipayFundTransToaccountTransferResponse response,
+ public void addExtractResultMsg(Extract extract, AlipayFundTransUniTransferResponse response,
AdminUser adminUser) {
String content = new Gson().toJson(new AlipayTransferResultInfo(extract, response, adminUser));
cmqUtil.sendMsg(EXTRACT_RESULT, content);
@@ -276,26 +271,29 @@
cmqUtil.deleteMsg(FANLI_ORDER_NEW, receiptHandle);
}
- // 鎻愭垚杩斿埄
- public void addFanLiTiChengMsg(Long uid) {
- cmqUtil.sendMsg(FANLI_TICHENG_ORDER, uid + "");
+
+
+ // 鍒嗕韩璁㈠崟鏀剁泭
+ public void addFanLiShareMsg(UidDateDTO dto) {
+ cmqUtil.sendMsg(FANLI_SHARE_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> 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, Long.parseLong(result));
+ map.put(msg.receiptHandle, dto);
}
}
return map;
}
- public void deleteFanLiTiChengMsg(String receiptHandle) {
- cmqUtil.deleteMsg(FANLI_TICHENG_ORDER, receiptHandle);
+ public void deleteFanLiShareMsg(String receiptHandle) {
+ cmqUtil.deleteMsg(FANLI_SHARE_ORDER, receiptHandle);
}
// 缁存潈璁㈠崟
@@ -445,29 +443,6 @@
*/
public void deleteTBImpGoodsUpdateMsg(String receiptHandle) {
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