From 30d8e227e8d823b6c38c3b9c90ac2df03b63befe Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 25 二月 2025 16:41:22 +0800
Subject: [PATCH] 淘宝转链接口更新

---
 fanli/src/main/java/com/yeshi/fanli/util/order/CommonOrderUtil.java |  198 ++++++++++++++++++++++++------------------------
 1 files changed, 99 insertions(+), 99 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/order/CommonOrderUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/order/CommonOrderUtil.java
index 25dbd94..5a26df5 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/order/CommonOrderUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/order/CommonOrderUtil.java
@@ -1,99 +1,99 @@
-package com.yeshi.fanli.util.order;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-import com.yeshi.fanli.entity.order.CommonOrder;
-
-public class CommonOrderUtil {
-
-	/**
-	 * 灏辩畻鏀剁泭
-	 * @Title: computeIncome
-	 * @Description: 
-	 * @param orderList
-	 * @return 
-	 * BigDecimal 杩斿洖绫诲瀷
-	 * @throws
-	 */
-	public static BigDecimal computeIncome(List<CommonOrder> orderList) {
-		if (orderList == null || orderList.size() == 0)
-			return null;
-		BigDecimal money = new BigDecimal(0);
-		for (CommonOrder commonOrder : orderList)
-			if (commonOrder.getState() != CommonOrder.STATE_SX && commonOrder.geteIncome() != null)
-				money = money.add(commonOrder.geteIncome());
-		return money;
-	}
-
-	/**
-	 * 璁$畻棰勪及鏀剁泭
-	 * @Title: computeEstimate
-	 * @Description: 
-	 * @param orderList
-	 * @return 
-	 * BigDecimal 杩斿洖绫诲瀷
-	 * @throws
-	 */
-	public static BigDecimal computeEstimate(List<CommonOrder> orderList) {
-		if (orderList == null || orderList.size() == 0)
-			return null;
-		BigDecimal money = new BigDecimal(0);
-		for (CommonOrder commonOrder : orderList)
-			if (commonOrder.getState() != CommonOrder.STATE_SX && commonOrder.getEstimate() != null)
-				money = money.add(commonOrder.getEstimate());
-		return money;
-	}
-
-	public static Integer getState(List<CommonOrder> orderList) {
-		if (orderList == null || orderList.size() == 0)
-			return null;
-		int sxCount = 0;
-		int wqCount = 0;
-		int fkCount = 0;
-		int jsCount = 0;
-		for (CommonOrder order : orderList) {
-			switch (order.getState()) {
-			case CommonOrder.STATE_FK:
-				fkCount++;
-				break;
-			case CommonOrder.STATE_JS:
-				jsCount++;
-				break;
-			case CommonOrder.STATE_SX:
-				sxCount++;
-				break;
-			case CommonOrder.STATE_WQ:
-				wqCount++;
-				break;
-			}
-		}
-
-		if (sxCount == orderList.size())
-			return CommonOrder.STATE_SX;
-
-		if (wqCount + sxCount == orderList.size())
-			return CommonOrder.STATE_WQ;
-
-		if (wqCount + sxCount + jsCount == orderList.size())
-			return CommonOrder.STATE_JS;
-
-		return CommonOrder.STATE_FK;
-	}
-
-	public static Date getSettlementTime(List<CommonOrder> orderList) {
-		if (orderList == null)
-			return null;
-		for (CommonOrder order : orderList) {
-			switch (order.getState()) {
-
-			case CommonOrder.STATE_JS:
-			case CommonOrder.STATE_WQ:
-				return order.getSettleTime();
-			}
-		}
-		return null;
-	}
-
-}
+package com.yeshi.fanli.util.order;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+import com.yeshi.fanli.entity.order.CommonOrder;
+
+public class CommonOrderUtil {
+
+	/**
+	 * 灏辩畻鏀剁泭
+	 * @Title: computeIncome
+	 * @Description: 
+	 * @param orderList
+	 * @return 
+	 * BigDecimal 杩斿洖绫诲瀷
+	 * @throws
+	 */
+	public static BigDecimal computeIncome(List<CommonOrder> orderList) {
+		if (orderList == null || orderList.size() == 0)
+			return null;
+		BigDecimal money = new BigDecimal(0);
+		for (CommonOrder commonOrder : orderList)
+			if (commonOrder.getState() != CommonOrder.STATE_SX && commonOrder.geteIncome() != null)
+				money = money.add(commonOrder.geteIncome());
+		return money;
+	}
+
+	/**
+	 * 璁$畻棰勪及鏀剁泭
+	 * @Title: computeEstimate
+	 * @Description: 
+	 * @param orderList
+	 * @return 
+	 * BigDecimal 杩斿洖绫诲瀷
+	 * @throws
+	 */
+	public static BigDecimal computeEstimate(List<CommonOrder> orderList) {
+		if (orderList == null || orderList.size() == 0)
+			return null;
+		BigDecimal money = new BigDecimal(0);
+		for (CommonOrder commonOrder : orderList)
+			if (commonOrder.getState() != CommonOrder.STATE_SX && commonOrder.getEstimate() != null)
+				money = money.add(commonOrder.getEstimate());
+		return money;
+	}
+
+	public static Integer getState(List<CommonOrder> orderList) {
+		if (orderList == null || orderList.size() == 0)
+			return null;
+		int sxCount = 0;
+		int wqCount = 0;
+		int fkCount = 0;
+		int jsCount = 0;
+		for (CommonOrder order : orderList) {
+			switch (order.getState()) {
+			case CommonOrder.STATE_FK:
+				fkCount++;
+				break;
+			case CommonOrder.STATE_JS:
+				jsCount++;
+				break;
+			case CommonOrder.STATE_SX:
+				sxCount++;
+				break;
+			case CommonOrder.STATE_WQ:
+				wqCount++;
+				break;
+			}
+		}
+
+		if (sxCount == orderList.size())
+			return CommonOrder.STATE_SX;
+
+		if (wqCount + sxCount == orderList.size())
+			return CommonOrder.STATE_WQ;
+
+		if (wqCount + sxCount + jsCount == orderList.size())
+			return CommonOrder.STATE_JS;
+
+		return CommonOrder.STATE_FK;
+	}
+
+	public static Date getSettlementTime(List<CommonOrder> orderList) {
+		if (orderList == null)
+			return null;
+		for (CommonOrder order : orderList) {
+			switch (order.getState()) {
+
+			case CommonOrder.STATE_JS:
+			case CommonOrder.STATE_WQ:
+				return order.getSettleTime();
+			}
+		}
+		return null;
+	}
+
+}

--
Gitblit v1.8.0