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/inter/taobao/TaoBaoOrderService.java |   29 ++++++++++++++++++++++++++---
 1 files changed, 26 insertions(+), 3 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 da440f4..6292013 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
@@ -54,14 +54,37 @@
 	 * @param realtionId
 	 */
 	public void bindSpecialIdAndRealtionId(String tradeId, String specialId, String realtionId);
-	
-	
-	
+
 	/**
 	 * 鏍规嵁浜ゆ槗ID鑾峰彇璁㈠崟鍙�
+	 * 
 	 * @param tradeId
 	 * @return
 	 */
 	public TaoBaoOrder selectByTradeId(String tradeId);
 
+	/**
+	 * 妫�绱㈡墍鏈夎鍗曞垪琛�
+	 * 
+	 * @param page
+	 * @param pageSize
+	 * @return
+	 */
+	public List<TaoBaoOrder> listAllOrder(int page, int pageSize);
+
+	/**
+	 * 璁㈠崟鎬婚噺
+	 * 
+	 * @return
+	 */
+	public long countAllOrder();
+
+	/**
+	 * 鏍规嵁涓婚敭妫�绱�
+	 * 
+	 * @param id
+	 * @return
+	 */
+	public TaoBaoOrder selectByPrimaryKey(Long id);
+
 }

--
Gitblit v1.8.0