From 28cf328a098334b51a3e9d2d56f983fb8c862211 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 23 五月 2020 09:54:38 +0800
Subject: [PATCH] 足迹、收藏订单兼容新需求
---
fanli/src/main/java/com/yeshi/fanli/util/rocketmq/order/MQLocalTransactionChecker.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/rocketmq/order/MQLocalTransactionChecker.java b/fanli/src/main/java/com/yeshi/fanli/util/rocketmq/order/MQLocalTransactionChecker.java
index da1a276..6b569e1 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/rocketmq/order/MQLocalTransactionChecker.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/rocketmq/order/MQLocalTransactionChecker.java
@@ -19,7 +19,6 @@
import com.yeshi.fanli.service.inter.hongbao.HongBaoV2SettleTempService;
import com.yeshi.fanli.service.inter.order.CommonOrderService;
import com.yeshi.fanli.service.inter.order.HongBaoOrderService;
-import com.yeshi.fanli.service.inter.order.InviteOrderSubsidyService;
import com.yeshi.fanli.util.rocketmq.MQTopicName;
@Component
@@ -30,9 +29,6 @@
@Resource
private HongBaoV2SettleTempService hongBaoV2SettleTempService;
-
- @Resource
- private InviteOrderSubsidyService inviteOrderSubsidyService;
@Resource
private CommonOrderService commonOrderService;
@@ -54,7 +50,12 @@
return TransactionStatus.CommitTransaction;
else
return TransactionStatus.RollbackTransaction;
- } else if (tag.equalsIgnoreCase(OrderTopicTagEnum.orderFanLiDelay.name())) {
+ } else if (tag.equalsIgnoreCase(OrderTopicTagEnum.teamRewardPreRecieved.name())) {
+ if (hongBaoV2SettleTempService.countByKey(msg.getKey()) > 0)
+ return TransactionStatus.CommitTransaction;
+ else
+ return TransactionStatus.RollbackTransaction;
+ }else if (tag.equalsIgnoreCase(OrderTopicTagEnum.orderFanLiDelay.name())) {
OrderMoneyRecievedMQMsg dto = new Gson().fromJson(new String(msg.getBody()),
OrderMoneyRecievedMQMsg.class);
if (dto != null) {
--
Gitblit v1.8.0