From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期三, 20 五月 2020 17:25:08 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2 --- fanli/src/main/java/com/yeshi/fanli/dto/mq/order/OrderTopicTagEnum.java | 10 +++++++--- 1 files changed, 7 insertions(+), 3 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 ae0d31b..0123b9b 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 @@ -4,6 +4,8 @@ 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.dto.mq.order.body.TeamRewardPreRecieveMQMsg; +import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder; public enum OrderTopicTagEnum { orderStatistic(OrderMQMsg.class), // 璁㈠崟缁熻 @@ -11,11 +13,13 @@ orderUpdate(OrderMoneyRecievedMQMsg.class), // 璁㈠崟淇敼 orderFanLiActual(OrderMoneyRecievedMQMsg.class), // 璁㈠崟瀹炴椂鍒拌处 orderFanLiDelay(OrderMoneyRecievedMQMsg.class), // 璁㈠崟鍒拌处寤舵椂娑堟伅 - orderConfirm(OrderConfirmMQMsg.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(TeamRewardPreRecieveMQMsg.class);//鍥㈤槦濂栭噾棰勫埌璐� private final Class<?> clazz; -- Gitblit v1.8.0