From f4d4486e55b91ab2d6313c48dbe8500c3928e8fa Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 14 四月 2020 09:19:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/factory/order/dividents/TeamDividentsSourceOrderFactory.java | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/order/dividents/TeamDividentsSourceOrderFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/order/dividents/TeamDividentsSourceOrderFactory.java
index 2fe05ad..f5b482c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/factory/order/dividents/TeamDividentsSourceOrderFactory.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/order/dividents/TeamDividentsSourceOrderFactory.java
@@ -5,7 +5,6 @@
import java.util.Date;
import java.util.List;
-import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum;
import com.yeshi.fanli.entity.order.CommonOrder;
import com.yeshi.fanli.entity.order.dividents.TeamDividentsSourceOrder;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
@@ -20,15 +19,14 @@
for (CommonOrder commonOrder : commonOrderList) {
if (commonOrder.geteIncome() != null)
money = money.add(commonOrder.geteIncome());
-
if (commonOrder.getState() == CommonOrder.STATE_SX)
invalidCount++;
}
-
- if (money.compareTo(new BigDecimal(0)) <= 0)
+
+ if (invalidCount >= commonOrderList.size())
return null;
- if (invalidCount >= commonOrderList.size())
+ if (money.compareTo(new BigDecimal(0)) <= 0)
return null;
BigDecimal dividents = MoneyBigDecimalUtil.div(money.multiply(rate), new BigDecimal(100));
--
Gitblit v1.8.0