From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java |   51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 50 insertions(+), 1 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 4bfb157..42908c3 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;
@@ -372,8 +373,56 @@
 	 * @param list
 	 * @return
 	 */
-	public List<CommonOrderVO> searchOrderByUid(int page, int size, Long uid, List<ESOrder> list) throws Exception;
+	public List<CommonOrderVO> searchOrderByUid(AcceptData acceptData, int page, int size, Long uid, List<ESOrder> list) throws Exception;
 
 	public long countSearchOrderByUid(Long uid, List<ESOrder> list);
+	
+	/**
+	 * 杩斿洖璁㈠崟鐨勭涓夋柟鍒涘缓鏃堕棿
+	 * @Title: getThirdCreateTime
+	 * @Description: 
+	 * @param orderId
+	 * @param sourceType
+	 * @return 
+	 * Date 杩斿洖绫诲瀷
+	 * @throws
+	 */
+	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);
 
 }

--
Gitblit v1.8.0