From 469bba3a544b3beef0c170f6fce5804c9e8a9676 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期五, 10 四月 2020 17:02:51 +0800
Subject: [PATCH] 消息

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java |   34 ++++++++++++++++++++++++++++++++++
 1 files changed, 34 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 9079e45..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;
@@ -391,4 +392,37 @@
 	
 	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