From 3340ed122e19e3943ce4f93eb52103b623a3fc2c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 27 四月 2022 15:43:58 +0800
Subject: [PATCH] 订单消息bug修改

---
 fanli/src/main/java/com/yeshi/fanli/util/mq/cmq/order/VipShopOrderCMQManager.java |  104 +++++++++++++++++++++++++++------------------------
 1 files changed, 55 insertions(+), 49 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/mq/cmq/order/VipShopOrderCMQManager.java b/fanli/src/main/java/com/yeshi/fanli/util/mq/cmq/order/VipShopOrderCMQManager.java
index 064134a..9a6c583 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/mq/cmq/order/VipShopOrderCMQManager.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/mq/cmq/order/VipShopOrderCMQManager.java
@@ -4,6 +4,7 @@
 import java.util.List;
 import java.util.Map;
 
+import com.yeshi.fanli.util.mq.cmq.TDMQUtil;
 import org.yeshi.utils.CMQUtil;
 
 import com.qcloud.cmq.Message;
@@ -12,60 +13,65 @@
 
 public class VipShopOrderCMQManager {
 
-	private static String secretId = "AKIDTlpgJhLjOozvd6QI2XnpfGbgV4NQJk25";
-	private static String secretKey = "xhCSUHo55oHUQ6XicFcmfIgspX0EEzWo";
-	private static VipShopOrderCMQManager vipShopOrderCMQManager;
-	private static CMQUtil cmqUtil;
+    private static String secretId = "AKIDTlpgJhLjOozvd6QI2XnpfGbgV4NQJk25";
+    private static String secretKey = "xhCSUHo55oHUQ6XicFcmfIgspX0EEzWo";
+    private static VipShopOrderCMQManager vipShopOrderCMQManager;
+    private static CMQUtil cmqUtil;
 
-	public static String VIPSHOP_ORDER = "order-vipshop";
+    public static String VIPSHOP_ORDER = "order-vipshop";
 
-	static {
-		cmqUtil = CMQUtil.getInstance(secretId, secretKey);
-		VIPSHOP_ORDER += "-" + Constant.systemCommonConfig.getProjectName();
-		cmqUtil.createQueue(VIPSHOP_ORDER);
-	}
+    static {
+        cmqUtil = CMQUtil.getInstance(secretId, secretKey);
+        VIPSHOP_ORDER += "-" + Constant.systemCommonConfig.getProjectName();
+        TDMQUtil.getInstance().init(secretId, secretKey, Constant.TDMQ_PUBLIC);
+        TDMQUtil.getInstance().createQueue(VIPSHOP_ORDER);
+    }
 
-	public static VipShopOrderCMQManager getInstance() {
-		if (vipShopOrderCMQManager == null)
-			vipShopOrderCMQManager = new VipShopOrderCMQManager();
-		return vipShopOrderCMQManager;
-	}
+    public static VipShopOrderCMQManager getInstance() {
+        if (vipShopOrderCMQManager == null)
+            vipShopOrderCMQManager = new VipShopOrderCMQManager();
+        return vipShopOrderCMQManager;
+    }
 
-	/**
-	 * 娣诲姞鍞搧浼氳鍗曞埌闃熷垪
-	 * 
-	 * @param orderId
-	 */
-	public void addVipShopOrder(String orderId) {
-		if (StringUtil.isNullOrEmpty(orderId))
-			return;
-		cmqUtil.sendMsg(VIPSHOP_ORDER, orderId);
-	}
+    /**
+     * 娣诲姞鍞搧浼氳鍗曞埌闃熷垪
+     *
+     * @param orderId
+     */
+    public void addVipShopOrder(String orderId) {
+        if (StringUtil.isNullOrEmpty(orderId))
+            return;
+        TDMQUtil.getInstance().sendMsg(VIPSHOP_ORDER, orderId);
+    }
 
-	/**
-	 * 娑堣垂闃熷垪娑堟伅
-	 * 
-	 * @param count
-	 * @return
-	 */
-	public Map<String, String> consumeVipShopOrder(int count) {
-		List<Message> list = cmqUtil.recieveMsg(count, VIPSHOP_ORDER);
-		Map<String, String> map = new HashMap<>();
-		if (list != null)
-			for (Message msg : list) {
-				String result = msg.msgBody;
-				map.put(msg.receiptHandle, result);
-			}
-		return map;
-	}
+    /**
+     * 娑堣垂闃熷垪娑堟伅
+     *
+     * @param count
+     * @return
+     */
+    public Map<String, String> consumeVipShopOrder(int count) {
+        List<Message> list = Constant.TDMQ_CONSUMER ? TDMQUtil.getInstance().recieveMsg(count, VIPSHOP_ORDER) : cmqUtil.recieveMsg(count, VIPSHOP_ORDER);
+        Map<String, String> map = new HashMap<>();
+        if (list != null)
+            for (Message msg : list) {
+                String result = msg.msgBody;
+                map.put(msg.receiptHandle, result);
+            }
+        return map;
+    }
 
-	/**
-	 * 鍒犻櫎鍞搧浼氶槦鍒�
-	 * 
-	 * @param receiptHandle
-	 */
-	public void deleteVipShopOrder(String receiptHandle) {
-		cmqUtil.deleteMsg(VIPSHOP_ORDER, receiptHandle);
-	}
+    /**
+     * 鍒犻櫎鍞搧浼氶槦鍒�
+     *
+     * @param receiptHandle
+     */
+    public void deleteVipShopOrder(String receiptHandle) {
+        if (Constant.TDMQ_CONSUMER) {
+            TDMQUtil.getInstance().deleteMsg(VIPSHOP_ORDER, receiptHandle);
+        } else {
+            cmqUtil.deleteMsg(VIPSHOP_ORDER, receiptHandle);
+        }
+    }
 
 }

--
Gitblit v1.8.0