From 457265eb82265650cf6c87519803975f23bd2fd3 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 18:33:21 +0800
Subject: [PATCH] 订单统计与返利到账集成测试相关的bug修改
---
fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/order/InviteOrderSubsidyMessageListener.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/order/InviteOrderSubsidyMessageListener.java b/fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/order/InviteOrderSubsidyMessageListener.java
index f0b0837..e1881d6 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/order/InviteOrderSubsidyMessageListener.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/order/InviteOrderSubsidyMessageListener.java
@@ -14,9 +14,12 @@
import com.google.gson.Gson;
import com.yeshi.fanli.dto.mq.order.OrderTopicTagEnum;
import com.yeshi.fanli.dto.mq.order.body.OrderMQMsg;
+import com.yeshi.fanli.dto.mq.order.body.TeamRewardPreRecieveMQMsg;
+import com.yeshi.fanli.exception.ParamsException;
+import com.yeshi.fanli.exception.money.OrderMoneySettleException;
+import com.yeshi.fanli.exception.money.TeamEincomeRecordException;
import com.yeshi.fanli.exception.order.CommonOrderException;
import com.yeshi.fanli.exception.order.InviteOrderSubsidyException;
-import com.yeshi.fanli.exception.order.OrderTeamRewardException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.mq.MQUnSendInfoService;
import com.yeshi.fanli.service.inter.order.CommonOrderService;
@@ -80,9 +83,6 @@
} catch (InviteOrderSubsidyException e) {
e.printStackTrace();
LogHelper.errorDetailInfo(e, new Gson().toJson(dto), "");
- } catch (OrderTeamRewardException e) {
- e.printStackTrace();
- LogHelper.errorDetailInfo(e, new Gson().toJson(dto), "");
} catch (CommonOrderException e) {
e.printStackTrace();
LogHelper.errorDetailInfo(e, new Gson().toJson(dto), "");
@@ -97,6 +97,21 @@
}
}
}
+ } else if (tag.equalsIgnoreCase(OrderTopicTagEnum.teamRewardPreRecieved.name())) {// 鍥㈤槦濂栭噾棰勫埌璐�
+ TeamRewardPreRecieveMQMsg dto = new Gson().fromJson(new String(message.getBody()),
+ TeamRewardPreRecieveMQMsg.class);
+ try {
+ teamSubsidyManager.addToTeamEincome(dto.getUid(), message.getKey(), dto.getPreGetTime());
+ return Action.CommitMessage;
+ } catch (OrderMoneySettleException e) {
+ e.printStackTrace();
+ } catch (TeamEincomeRecordException e) {
+ e.printStackTrace();
+ } catch (ParamsException e) {
+ e.printStackTrace();
+ }
+
+ return Action.ReconsumeLater;
}
}
return Action.CommitMessage;
--
Gitblit v1.8.0