From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/dto/mq/order/OrderTopicTagEnum.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 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 a4020bf..3dc76d6 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
@@ -1,8 +1,10 @@
 package com.yeshi.fanli.dto.mq.order;
 
 import com.yeshi.fanli.dto.mq.order.body.BanLiShopOrderMQMsg;
+import com.yeshi.fanli.dto.mq.order.body.OrderConfirmMQMsg;
 import com.yeshi.fanli.dto.mq.order.body.OrderMQMsg;
 import com.yeshi.fanli.dto.mq.order.body.OrderMoneyRecievedMQMsg;
+import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
 
 public enum OrderTopicTagEnum {
 	orderStatistic(OrderMQMsg.class), // 璁㈠崟缁熻
@@ -10,10 +12,13 @@
 	orderUpdate(OrderMoneyRecievedMQMsg.class), // 璁㈠崟淇敼
 	orderFanLiActual(OrderMoneyRecievedMQMsg.class), // 璁㈠崟瀹炴椂鍒拌处
 	orderFanLiDelay(OrderMoneyRecievedMQMsg.class), // 璁㈠崟鍒拌处寤舵椂娑堟伅
-	orderFanLiSeparateByOrderNo(OrderMoneyRecievedMQMsg.class),//璁㈠崟瀹炴椂鍒拌处锛屾寜璁㈠崟鍙峰垎绂�
+	orderConfirm(OrderConfirmMQMsg.class), // 璁㈠崟纭鏀惰揣
+	orderFanLiSeparateByOrderNo(OrderMoneyRecievedMQMsg.class), // 璁㈠崟瀹炴椂鍒拌处锛屾寜璁㈠崟鍙峰垎绂�
 	banLiShopOrderDelay(BanLiShopOrderMQMsg.class), // 鏉挎牀鍟嗗煄涓嬪崟
 	banLiShopOrderRefund(BanLiShopOrderMQMsg.class), // 鏉挎牀鍟嗗煄璁㈠崟閫�娆�
-	banLiShopOrderPaid(BanLiShopOrderMQMsg.class);// 鍟嗗煄璁㈠崟鏀粯鎴愬姛
+	banLiShopOrderPaid(BanLiShopOrderMQMsg.class), // 鍟嗗煄璁㈠崟鏀粯鎴愬姛
+	taoBaoOrderWeiQuan(TaoBaoWeiQuanOrder.class),// 娣樺疂缁存潈璁㈠崟
+	teamRewardPreRecieved(OrderMoneyRecievedMQMsg.class);//鍥㈤槦濂栭噾棰勫埌璐�
 
 	private final Class<?> clazz;
 

--
Gitblit v1.8.0