From bbe0a2fd03063316e50cf141986bda984599bbda Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Tue, 22 Feb 2022 23:41:42 +0800
Subject: [PATCH] Merge branch 'developer'
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxCommonAction.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxCommonAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxCommonAction.java
index c241c7e..1adc3d1 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxCommonAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxCommonAction.java
@@ -1,10 +1,9 @@
package com.matrix.system.shopXcx.api.action;
-import com.matrix.component.rabbitmq.RabiitMqTemplate;
+import com.matrix.component.asyncmessage.AsyncMessageManager;
import com.matrix.component.wechat.externalInterface.common.Signature;
import com.matrix.component.wechat.externalInterface.common.Util;
import com.matrix.component.wechat.externalInterface.protocol.queryProtocol.NotifyData;
-import com.matrix.config.RabbitMqConfig;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.tools.LogUtil;
import com.matrix.system.common.bean.BusParameterSettings;
@@ -25,7 +24,7 @@
import com.matrix.system.shopXcx.dao.ShopActivitiesGroupJoinUserDao;
import com.matrix.system.shopXcx.dao.ShopOrderDao;
import com.matrix.system.shopXcx.dao.ShopPayLogDao;
-import com.matrix.system.shopXcx.mqTask.MQTaskRouting;
+import com.matrix.system.shopXcx.mqTask.AsyncMessageRouting;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -69,8 +68,6 @@
@Autowired
private ShopPayLogDao shopPayLogDao;
- @Autowired
- private RabiitMqTemplate rabiitMqTemplate;
@Autowired
private ShopActivitiesGroupJoinUserDao shopActivitiesGroupJoinUserDao;
@@ -87,6 +84,8 @@
@Autowired
ScoreVipDetailService scoreVipDetailService;
+ @Autowired
+ AsyncMessageManager asyncMessageManager;
@Value("${evn}")
@@ -196,8 +195,7 @@
}
// 根据订单类型创建不同的处理任务
- rabiitMqTemplate.sendTopicMsg(RabbitMqConfig.MQ_EXCHANGE_TOPIC +evn, MQTaskRouting.CREATE_ORDER+evn, orderId);
-
+ asyncMessageManager.sendMsg(AsyncMessageRouting.CREATE_ORDER,"orderId=%s",orderId);
threadResult.putInMap("status", "success");
--
Gitblit v1.9.1