From 554de444b87aab5f93cb1593a8095612cf9479a7 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 09 六月 2020 17:34:30 +0800
Subject: [PATCH] 订单
---
fanli/src/main/java/com/yeshi/fanli/util/factory/order/dividents/TeamDividentsSourceOrderFactory.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 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 ff235c1..0c70b19 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
@@ -13,10 +13,16 @@
public class TeamDividentsSourceOrderFactory {
public static TeamDividentsSourceOrder create(List<CommonOrder> commonOrderList) {
- BigDecimal money = new BigDecimal(0);
+ BigDecimal money = null;
int orderState = CommonOrderUtil.getState(commonOrderList);
if (orderState == CommonOrder.STATE_SX)
return null;
+
+ if (orderState == CommonOrder.STATE_FK) {
+ money = CommonOrderUtil.computeEstimate(commonOrderList);
+ } else {
+ money = CommonOrderUtil.computeIncome(commonOrderList);
+ }
if (money.compareTo(new BigDecimal(0)) <= 0)
return null;
@@ -41,6 +47,7 @@
sourceOrder.setState(TeamDividentsSourceOrder.STATE_UNKOWN);
}
sourceOrder.setUid(commonOrderList.get(0).getUserInfo().getId());
+ sourceOrder.setCreateTime(commonOrderList.get(0).getThirdCreateTime());//涓嬪崟鏃堕棿
return sourceOrder;
}
--
Gitblit v1.8.0