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/impl/taobao/TaoBaoOrderServiceImpl.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoOrderServiceImpl.java
index 1c4a98f..59cc845 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoOrderServiceImpl.java
@@ -193,4 +193,15 @@
 		return taoBaoOrderMapper.selectByPrimaryKey(id);
 	}
 
+	@Override
+	public List<TaoBaoOrder> listBySettlementTime(Long minTime, Long maxTime, int page, int pageSize) {
+
+		return taoBaoOrderMapper.listBySettlementTime(minTime, maxTime, (page - 1) * pageSize, pageSize);
+	}
+
+	@Override
+	public Long countBySettlementTime(Long minTime, Long maxTime) {
+		return taoBaoOrderMapper.countBySettlementTime(minTime, maxTime);
+	}
+
 }

--
Gitblit v1.8.0