From 48a204f4c90a80c0bb4e5ba1f9f0f42939cadba8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 01 一月 2020 10:19:34 +0800
Subject: [PATCH] 用户资金记录bug修改，京东，拼多多小程序商品转链

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java |   23 +++++++++++++++++++++++
 1 files changed, 23 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 ef60243..236e198 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,10 +9,12 @@
 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;
 import com.yeshi.fanli.vo.order.CommonOrderVO;
+import com.yeshi.fanli.vo.order.OrderCountVO;
 
 import net.sf.json.JSONObject;
 
@@ -353,4 +355,25 @@
 	 */
 	public long count24HValidOrderByUid(Long uid, Date minTime);
 
+	/**
+	 * 璁㈠崟缁熻鏈夋晥鏁伴噺
+	 * @param uid
+	 * @param day
+	 * @param source
+	 * @return
+	 */
+	public OrderCountVO getOrderCount(Long uid, Integer day, Integer source);
+
+	/**
+	 * 鎼滅储璁㈠崟淇℃伅
+	 * @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