From 09417e97672be66c5e312b10f23a9e30da3acb97 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@MS-20170306HGUF>
Date: 星期一, 24 二月 2020 15:23:08 +0800
Subject: [PATCH] 热销转换发圈

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 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 af0a07d..b1da93c 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
@@ -9,6 +9,7 @@
 import com.yeshi.fanli.entity.accept.AcceptData;
 import com.yeshi.fanli.entity.jd.JDOrder;
 import com.yeshi.fanli.entity.order.CommonOrder;
+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.exception.order.CommonOrderException;
@@ -65,7 +66,7 @@
 	 * @throws CommonOrderException
 	 */
 	long countGroupOrderNoByUid(Long uid, Integer state, Integer type, Integer orderState, String orderNo,
-			String startTime, String endTime, Integer dateType, Integer source) throws CommonOrderException;
+			String startTime, String endTime, Integer dateType, List<Integer> listSource) throws CommonOrderException;
 
 	/**
 	 * 绉诲姩娈佃鍗曞垪琛�
@@ -79,7 +80,7 @@
 	 * @return
 	 */
 	public List<CommonOrderVO> getOrderByUid(AcceptData acceptData, Integer page, Long uid, Integer state, Integer type,
-			Integer orderState, String orderNo, String startTime, String endTime, Integer dateType, Integer source)
+			Integer orderState, String orderNo, String startTime, String endTime, Integer dateType, List<Integer> listSource)
 			throws CommonOrderException,Exception;
 
 	/**
@@ -361,6 +362,18 @@
 	 * @param source
 	 * @return
 	 */
-	public OrderCountVO getOrderCount(Long uid, Integer day, Integer source);
+	public OrderCountVO getOrderCount(Long uid, Integer day,  List<Integer> listSource);
+
+	/**
+	 * 鎼滅储璁㈠崟淇℃伅
+	 * @param page
+	 * @param size
+	 * @param uid
+	 * @param list
+	 * @return
+	 */
+	public List<CommonOrderVO> searchOrderByUid(int page, int size, Long uid, List<ESOrder> list) throws Exception;
+
+	public long countSearchOrderByUid(Long uid, List<ESOrder> list);
 
 }

--
Gitblit v1.8.0