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 | 66 ++++-----------------------------
1 files changed, 8 insertions(+), 58 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 2b2cb6e..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,12 +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.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;
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
@@ -43,11 +43,10 @@
// 杩斿埄闃熷垪
public static String FANLI_ORDER_NEW = "fanli-order-new";
- // 鍥㈤槦鏀剁泭
- public static String FANLI_TEAM_INCOME_ORDER = "fanli-team-income-order";
+
// 鍒嗕韩璁㈠崟鏀剁泭
- public static String FANLI_SHARE_ORDER = "fanli-team-income-order";
+ public static String FANLI_SHARE_ORDER = "fanli-share-order";
// 缁存潈璁㈠崟
public static String ORDER_WEIQUAN = "weiquan-order";
@@ -55,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 {
@@ -67,10 +64,9 @@
PUSH_IOS = "test-" + PUSH_IOS;
FANLI_ORDER = "test-" + FANLI_ORDER;
FANLI_ORDER_NEW = "test-" + FANLI_ORDER_NEW;
- 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;
}
@@ -80,10 +76,8 @@
PUSH_IOS += "-" + Constant.systemCommonConfig.getProjectName();
FANLI_ORDER += "-" + Constant.systemCommonConfig.getProjectName();
FANLI_ORDER_NEW += "-" + 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);
@@ -94,11 +88,11 @@
cmqUtil.createQueue(PUSH_IOS);
cmqUtil.createQueue(FANLI_ORDER);
cmqUtil.createQueue(FANLI_ORDER_NEW);
- 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);
}
@@ -192,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);
@@ -277,28 +271,7 @@
cmqUtil.deleteMsg(FANLI_ORDER_NEW, receiptHandle);
}
- // 鍥㈤槦鏀剁泭
- public void addFanLiTeamIncomeMsg(UidDateDTO dto) {
- cmqUtil.sendMsg(FANLI_TEAM_INCOME_ORDER, new Gson().toJson(dto) + "");
- }
-
- 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, dto);
- }
- }
- return map;
- }
-
- public void deleteTeamIncomeMsg(String receiptHandle) {
- cmqUtil.deleteMsg(FANLI_TEAM_INCOME_ORDER, receiptHandle);
- }
+
// 鍒嗕韩璁㈠崟鏀剁泭
public void addFanLiShareMsg(UidDateDTO dto) {
@@ -470,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