From dadacf7c1065876248bec86cf17c06ca4be1b97c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 30 七月 2019 14:55:17 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoOrderServiceImpl.java |   26 ++++++++++++++++++++++++++
 1 files changed, 26 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 c7493f6..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
@@ -178,4 +178,30 @@
 		return taoBaoOrderMapper.selectTaoBaoOrderByTradeId(tradeId);
 	}
 
+	@Override
+	public List<TaoBaoOrder> listAllOrder(int page, int pageSize) {
+		return taoBaoOrderMapper.listAllOrder(null, (page - 1) * pageSize, pageSize);
+	}
+
+	@Override
+	public long countAllOrder() {
+		return taoBaoOrderMapper.countAllOrder(null);
+	}
+
+	@Override
+	public TaoBaoOrder selectByPrimaryKey(Long id) {
+		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