From dc5be7d38446f70e6ff86df311119c32b41fe7f8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 28 十一月 2020 16:37:05 +0800
Subject: [PATCH] 大淘客搜索接口升级

---
 fanli/src/main/java/com/yeshi/fanli/util/factory/order/dividents/TeamDividentsSourceOrderFactory.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 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..cf23b63 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
@@ -7,16 +7,22 @@
 
 import com.yeshi.fanli.entity.order.CommonOrder;
 import com.yeshi.fanli.entity.order.dividents.TeamDividentsSourceOrder;
-import com.yeshi.fanli.util.TimeUtil;
+import org.yeshi.utils.TimeUtil;
 import com.yeshi.fanli.util.order.CommonOrderUtil;
 
 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