From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java |   52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 52 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java
index c44e349..f831d48 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java
@@ -12,6 +12,7 @@
 import com.yeshi.fanli.entity.order.ESOrder;
 import com.yeshi.fanli.entity.pdd.PDDOrder;
 import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
+import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
 import com.yeshi.fanli.exception.order.CommonOrderException;
 import com.yeshi.fanli.vo.order.CommonOrderVO;
 import com.yeshi.fanli.vo.order.OrderCountVO;
@@ -388,4 +389,55 @@
 	 */
 	public Date getThirdCreateTime(String orderId,int sourceType);
 
+	
+	public List<CommonOrder> getMinSettleTimeAndUid();
+
+	/**
+	 * 鏂扮増绾㈠寘淇℃伅2.1
+	 * @param acceptData
+	 * @param page
+	 * @param uid
+	 * @param state
+	 * @param type
+	 * @param orderState
+	 * @param orderNo
+	 * @param startTime
+	 * @param endTime
+	 * @param dateType
+	 * @param listSource
+	 * @return
+	 * @throws CommonOrderException
+	 * @throws Exception
+	 */
+	public List<CommonOrderVO> getOrderList(AcceptData acceptData, Integer page, Long uid, Integer state, Integer type,
+			Integer orderState, String orderNo, String startTime, String endTime, Integer dateType,
+			List<Integer> listSource) throws CommonOrderException, Exception;
+
+	long countOrderList(Long uid, Integer state, Integer type, Integer orderState, String orderNo, String startTime,
+			String endTime, Integer dateType, List<Integer> listSource) throws CommonOrderException;
+
+	/**
+	 * 缁存潈閲戦璁＄畻
+	 * @param listWQ
+	 * @param sourceType
+	 * @param uid
+	 * @return
+	 */
+	public BigDecimal getWeiQuanMoney(List<TaoBaoWeiQuanOrder> listWQ, int sourceType, Long uid);
+
+	
+	/**
+	 * 缁熻璁㈠崟璁板綍鏁伴噺-闈炶鍗曞彿涓轰富
+	 * @param uid
+	 * @param payment
+	 * @return
+	 */
+	public long countOrderByUidAndSettled(Long uid, BigDecimal payment);
+
+	/**
+	 * 鑾峰彇鏈�鏂扮殑娣樺疂璁㈠崟鍙�
+	 * @return
+	 */
+	public String getNewestOrderNoByTaoBao();
+
 }

--
Gitblit v1.8.0