From 3727469752a977dde6327e2c48d761b20b565d3d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 15 七月 2022 09:19:21 +0800
Subject: [PATCH] 商品ID字符串化

---
 fanli/src/main/java/com/yeshi/fanli/util/mq/cmq/order/TeamOrderCMQManager.java |   58 +++++++++++++++++++---------------------------------------
 1 files changed, 19 insertions(+), 39 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/mq/cmq/order/TeamOrderCMQManager.java b/fanli/src/main/java/com/yeshi/fanli/util/mq/cmq/order/TeamOrderCMQManager.java
index 27ef879..53ca5b2 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/mq/cmq/order/TeamOrderCMQManager.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/mq/cmq/order/TeamOrderCMQManager.java
@@ -1,24 +1,21 @@
 package com.yeshi.fanli.util.mq.cmq.order;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.yeshi.fanli.util.mq.cmq.TDMQUtil;
-import org.yeshi.utils.CMQUtil;
-
 import com.google.gson.Gson;
 import com.qcloud.cmq.Message;
 import com.yeshi.fanli.dto.mq.UidDateDTO;
 import com.yeshi.fanli.util.Constant;
 import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.mq.cmq.TDMQUtil;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 public class TeamOrderCMQManager {
 
     private static String secretId = "AKIDTlpgJhLjOozvd6QI2XnpfGbgV4NQJk25";
     private static String secretKey = "xhCSUHo55oHUQ6XicFcmfIgspX0EEzWo";
     private static TeamOrderCMQManager jdOrderCMQManager;
-    private static CMQUtil cmqUtil;
 
     // 鍥㈤槦鍒嗙孩
     public static String TEAM_DIVIDENTS_PRE = "team_dividents_pre";
@@ -31,15 +28,8 @@
     public static String FANLI_TEAM_INCOME_ORDER = "fanli-team-income-order";
 
     static {
-        cmqUtil = CMQUtil.getInstance(secretId, secretKey);
         TDMQUtil.getInstance().init(secretId, secretKey, Constant.TDMQ_PUBLIC);
 
-        if (Constant.IS_TEST) {
-            TEAM_DIVIDENTS_PRE = "test-" + TEAM_DIVIDENTS_PRE;
-            FANLI_TEAM_INCOME_ORDER_PRE = "test-" + FANLI_TEAM_INCOME_ORDER_PRE;
-            TEAM_DIVIDENTS = "test-" + TEAM_DIVIDENTS;
-            FANLI_TEAM_INCOME_ORDER = "test-" + FANLI_TEAM_INCOME_ORDER;
-        }
 
         TEAM_DIVIDENTS_PRE += "-" + Constant.systemCommonConfig.getProjectName();
         FANLI_TEAM_INCOME_ORDER_PRE += "-" + Constant.systemCommonConfig.getProjectName();
@@ -64,7 +54,7 @@
 
     public Map<String, UidDateDTO> consumeTeamDividentsPreMsg(int count) {
         Gson gson = new Gson();
-        List<Message> list = Constant.TDMQ_CONSUMER ? TDMQUtil.getInstance().recieveMsg(count, TEAM_DIVIDENTS_PRE) : cmqUtil.recieveMsg(count, TEAM_DIVIDENTS_PRE);
+        List<Message> list = TDMQUtil.getInstance().recieveMsg(count, TEAM_DIVIDENTS_PRE);
         Map<String, UidDateDTO> map = new HashMap<>();
         if (list != null)
             for (Message msg : list) {
@@ -77,11 +67,9 @@
     }
 
     public void deleteTeamDividentsPreMsg(String receiptHandle) {
-        if (Constant.TDMQ_CONSUMER) {
-            TDMQUtil.getInstance().deleteMsg(TEAM_DIVIDENTS_PRE, receiptHandle);
-        } else {
-            cmqUtil.deleteMsg(TEAM_DIVIDENTS_PRE, receiptHandle);
-        }
+
+        TDMQUtil.getInstance().deleteMsg(TEAM_DIVIDENTS_PRE, receiptHandle);
+
     }
 
     // 鍥㈤槦鏀剁泭棰勫埌璐�
@@ -90,7 +78,7 @@
     }
 
     public Map<String, UidDateDTO> consumeFanLiTeamIncomePreMsg(int count) {
-        List<Message> list = Constant.TDMQ_CONSUMER ? TDMQUtil.getInstance().recieveMsg(count, FANLI_TEAM_INCOME_ORDER_PRE) : cmqUtil.recieveMsg(count, FANLI_TEAM_INCOME_ORDER_PRE);
+        List<Message> list = TDMQUtil.getInstance().recieveMsg(count, FANLI_TEAM_INCOME_ORDER_PRE);
         Map<String, UidDateDTO> map = new HashMap<>();
         if (list != null)
             for (Message msg : list) {
@@ -104,11 +92,9 @@
     }
 
     public void deleteTeamIncomePreMsg(String receiptHandle) {
-        if (Constant.TDMQ_CONSUMER) {
-            TDMQUtil.getInstance().deleteMsg(FANLI_TEAM_INCOME_ORDER_PRE, receiptHandle);
-        } else {
-            cmqUtil.deleteMsg(FANLI_TEAM_INCOME_ORDER_PRE, receiptHandle);
-        }
+
+        TDMQUtil.getInstance().deleteMsg(FANLI_TEAM_INCOME_ORDER_PRE, receiptHandle);
+
     }
 
     // 鍥㈤槦鍒嗙孩鍒拌处
@@ -118,7 +104,7 @@
 
     public Map<String, UidDateDTO> consumeTeamDividentsMsg(int count) {
         Gson gson = new Gson();
-        List<Message> list = Constant.TDMQ_CONSUMER ? TDMQUtil.getInstance().recieveMsg(count, TEAM_DIVIDENTS) : cmqUtil.recieveMsg(count, TEAM_DIVIDENTS);
+        List<Message> list = TDMQUtil.getInstance().recieveMsg(count, TEAM_DIVIDENTS);
         Map<String, UidDateDTO> map = new HashMap<>();
         if (list != null)
             for (Message msg : list) {
@@ -131,11 +117,9 @@
     }
 
     public void deleteTeamDividentsMsg(String receiptHandle) {
-        if (Constant.TDMQ_CONSUMER) {
-            TDMQUtil.getInstance().deleteMsg(TEAM_DIVIDENTS, receiptHandle);
-        } else {
-            cmqUtil.deleteMsg(TEAM_DIVIDENTS, receiptHandle);
-        }
+
+        TDMQUtil.getInstance().deleteMsg(TEAM_DIVIDENTS, receiptHandle);
+
     }
 
     // 鍥㈤槦鏀剁泭鍒拌处
@@ -144,7 +128,7 @@
     }
 
     public Map<String, UidDateDTO> consumeFanLiTeamIncomeMsg(int count) {
-        List<Message> list = Constant.TDMQ_CONSUMER ? TDMQUtil.getInstance().recieveMsg(count, FANLI_TEAM_INCOME_ORDER) : cmqUtil.recieveMsg(count, FANLI_TEAM_INCOME_ORDER);
+        List<Message> list = TDMQUtil.getInstance().recieveMsg(count, FANLI_TEAM_INCOME_ORDER);
         Map<String, UidDateDTO> map = new HashMap<>();
         if (list != null)
             for (Message msg : list) {
@@ -158,10 +142,6 @@
     }
 
     public void deleteTeamIncomeMsg(String receiptHandle) {
-        if (Constant.TDMQ_CONSUMER) {
-            TDMQUtil.getInstance().deleteMsg(FANLI_TEAM_INCOME_ORDER, receiptHandle);
-        } else {
-            cmqUtil.deleteMsg(FANLI_TEAM_INCOME_ORDER, receiptHandle);
-        }
+        TDMQUtil.getInstance().deleteMsg(FANLI_TEAM_INCOME_ORDER, receiptHandle);
     }
 }

--
Gitblit v1.8.0