From aa66729ef758105dc1ced739ffe88e253affc37a Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 16 七月 2019 15:49:28 +0800
Subject: [PATCH] Merge branch 'master-bug'

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoOrderServiceImpl.java |   15 +++++++++++++++
 1 files changed, 15 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..1c4a98f 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,19 @@
 		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);
+	}
+
 }

--
Gitblit v1.8.0