From 2bd2200f209ddb7bcc59b636d9de6f8b3f762958 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 23 四月 2020 10:00:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/order/InviteOrderSubsidyMessageListener.java | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 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..7465429 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,15 +14,19 @@
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;
import com.yeshi.fanli.service.inter.order.OrderMoneySettleService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponRecordService;
import com.yeshi.fanli.service.manger.order.TeamSubsidyManager;
+import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.rocketmq.MQTopicName;
@@ -51,10 +55,7 @@
@Resource
private CommonOrderService commonOrderService;
-
- // 鍥㈤槦濂栧姳寮�濮嬫椂闂�
- private static final long TEAM_REWARD_START_TIME = TimeUtil.convertToTimeTemp("2019-04-15", "yyyy-MM-dd");
-
+
public InviteOrderSubsidyMessageListener() {
}
@@ -73,14 +74,11 @@
if (dto != null) {
// 鏌ヨ鍑鸿鍗曞垱寤烘椂闂�
Date orderTime = commonOrderService.getThirdCreateTime(dto.getOrderId(), dto.getType());
- if (orderTime.getTime() >= TEAM_REWARD_START_TIME) {
+ if (orderTime.getTime() >= Constant.NEW_ORDER_FANLI_RULE_TIME) {
try {
teamSubsidyManager.addOrUpdateOrder(dto.getOrderId(), dto.getType());
return Action.CommitMessage;
} 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) {
@@ -97,6 +95,20 @@
}
}
}
+ } 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