From 486e22c57ca8a1e2dc6877b539e2f3add67250f1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 23 十一月 2019 18:28:00 +0800
Subject: [PATCH] 冲突解决
---
fanli/src/main/java/com/yeshi/fanli/dto/mq/order/OrderTopicTagEnum.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dto/mq/order/OrderTopicTagEnum.java b/fanli/src/main/java/com/yeshi/fanli/dto/mq/order/OrderTopicTagEnum.java
index 2ae8b75..a4020bf 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dto/mq/order/OrderTopicTagEnum.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dto/mq/order/OrderTopicTagEnum.java
@@ -6,9 +6,11 @@
public enum OrderTopicTagEnum {
orderStatistic(OrderMQMsg.class), // 璁㈠崟缁熻
+ orderStatisticDelay(OrderMQMsg.class), // 璁㈠崟缁熻寤舵椂
orderUpdate(OrderMoneyRecievedMQMsg.class), // 璁㈠崟淇敼
orderFanLiActual(OrderMoneyRecievedMQMsg.class), // 璁㈠崟瀹炴椂鍒拌处
orderFanLiDelay(OrderMoneyRecievedMQMsg.class), // 璁㈠崟鍒拌处寤舵椂娑堟伅
+ orderFanLiSeparateByOrderNo(OrderMoneyRecievedMQMsg.class),//璁㈠崟瀹炴椂鍒拌处锛屾寜璁㈠崟鍙峰垎绂�
banLiShopOrderDelay(BanLiShopOrderMQMsg.class), // 鏉挎牀鍟嗗煄涓嬪崟
banLiShopOrderRefund(BanLiShopOrderMQMsg.class), // 鏉挎牀鍟嗗煄璁㈠崟閫�娆�
banLiShopOrderPaid(BanLiShopOrderMQMsg.class);// 鍟嗗煄璁㈠崟鏀粯鎴愬姛
--
Gitblit v1.8.0