From 0a3e5a876724ac247b33632300701077098111eb Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 18 七月 2019 17:11:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/taobao/TaoBaoOrderService.java |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/taobao/TaoBaoOrderService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/taobao/TaoBaoOrderService.java
index 6292013..1a36f01 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/taobao/TaoBaoOrderService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/taobao/TaoBaoOrderService.java
@@ -87,4 +87,22 @@
 	 */
 	public TaoBaoOrder selectByPrimaryKey(Long id);
 
+	/**
+	 * 鏍规嵁缁撶畻鏃堕棿妫�绱�
+	 * 
+	 * @param page
+	 * @param pageSize
+	 * @return
+	 */
+	public List<TaoBaoOrder> listBySettlementTime(Long minTime, Long maxTime, int page, int pageSize);
+
+	/**
+	 * 鏍规嵁缁撶畻鏃堕棿璁℃暟
+	 * 
+	 * @param minTime
+	 * @param maxTime
+	 * @return
+	 */
+	public Long countBySettlementTime(Long minTime, Long maxTime);
+
 }

--
Gitblit v1.8.0