From ad9fbd2c18f280ef9bba47f28353d367cf2d94e8 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:28:03 +0800
Subject: [PATCH] Merge branch 'div_12'

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/taobao/TaoBaoOrderService.java |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 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 5690450..da440f4 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
@@ -37,12 +37,31 @@
 	 */
 	public List<TaoBaoOrder> getTaoBaoOrderByOrderId(String orderId);
 
-	
 	/**
 	 * 缁熻褰撴棩棰勪及鏀剁泭
-	 * @param date  2018-09-01
+	 * 
+	 * @param date
+	 *            2018-09-01
 	 * @return
 	 */
 	public double countEstimate(String date) throws Exception;
 
+	/**
+	 * 缁戝畾浼氬憳杩愯惀ID涓庢笭閬揑D(鏍规嵁浜ゆ槗ID)
+	 * 
+	 * @param tadeId
+	 * @param specialId
+	 * @param realtionId
+	 */
+	public void bindSpecialIdAndRealtionId(String tradeId, String specialId, String realtionId);
+	
+	
+	
+	/**
+	 * 鏍规嵁浜ゆ槗ID鑾峰彇璁㈠崟鍙�
+	 * @param tradeId
+	 * @return
+	 */
+	public TaoBaoOrder selectByTradeId(String tradeId);
+
 }

--
Gitblit v1.8.0