From 53672fd62a2084c8b3f8e7ce69e617ff9be58276 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 15 四月 2020 09:53:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/manger/order/TeamDividentsManager.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/manger/order/TeamDividentsManager.java b/fanli/src/main/java/com/yeshi/fanli/service/manger/order/TeamDividentsManager.java
index 89ae376..fc7a5e5 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/manger/order/TeamDividentsManager.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/manger/order/TeamDividentsManager.java
@@ -79,6 +79,9 @@
@Transactional(rollbackFor = Exception.class)
public void addDividentsSourceOrder(List<CommonOrder> commonOrderList) throws TeamDividentsSourceOrderException {
+ if (commonOrderList.get(0).getThirdCreateTime().getTime() < Constant.NEW_ORDER_FANLI_RULE_TIME)
+ return;
+
UserLevelEnum level = UserLevelUtil.getByOrderRank(commonOrderList.get(0).getUrank());
if (level == null)
level = UserLevelEnum.daRen;
@@ -91,7 +94,6 @@
} catch (ParamsException e) {
throw new TeamDividentsSourceOrderException(101, "鍙傛暟涓嶅畬鏁�");
}
-
}
/**
--
Gitblit v1.8.0