From 87a1f741ed6124f73789b0c105091c83cebf87b3 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 24 四月 2020 13:55:55 +0800
Subject: [PATCH] 用户会员信息修改

---
 fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/order/OrderDividentsMessageListener.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/order/OrderDividentsMessageListener.java b/fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/order/OrderDividentsMessageListener.java
index bf51c18..5367b4a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/order/OrderDividentsMessageListener.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/order/OrderDividentsMessageListener.java
@@ -31,6 +31,7 @@
 import com.yeshi.fanli.service.inter.user.vip.TeamUserLevelStatisticService;
 import com.yeshi.fanli.service.manger.order.TeamDividentsManager;
 import com.yeshi.fanli.service.manger.order.TeamDividentsSourceManager;
+import com.yeshi.fanli.util.Constant;
 import com.yeshi.fanli.util.order.CommonOrderUtil;
 import com.yeshi.fanli.util.rocketmq.MQTopicName;
 
@@ -78,7 +79,11 @@
 			}
 		} else if (MQTopicName.TOPIC_ORDER.name().equalsIgnoreCase(message.getTopic())) {
 			if (tag.equalsIgnoreCase(OrderTopicTagEnum.orderStatistic.name())) {
+
 				OrderMQMsg dto = new Gson().fromJson(new String(message.getBody()), OrderMQMsg.class);
+				if (dto == null || dto.getStaticticDate().getTime() < Constant.NEW_ORDER_FANLI_RULE_TIME)
+					return Action.CommitMessage;
+
 				if (dto.getHandleType() == OrderMQMsg.HANDLE_TYPE_ADD) {
 					List<CommonOrder> commonOrderList = commonOrderService.listBySourceTypeAndOrderId(dto.getType(),
 							dto.getOrderId());
@@ -113,7 +118,6 @@
 				}
 
 			} else if (tag.equalsIgnoreCase(OrderTopicTagEnum.orderConfirm.name())) {// 璁㈠崟纭鏀惰揣
-				// 鎻掑叆鍒嗙孩
 				OrderConfirmMQMsg dto = new Gson().fromJson(new String(message.getBody()), OrderConfirmMQMsg.class);
 				teamDividentsSourceManager.orderSettle(dto.getOrderNo(), dto.getSourceType());
 			} else if (tag.equalsIgnoreCase(OrderTopicTagEnum.taoBaoOrderWeiQuan.name())) {

--
Gitblit v1.8.0