From 3a6e476b2f498e876ff10f1328455f58e63ee85a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 04 四月 2019 09:30:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/taobao/TaoBaoOrderService.java |   14 ++++++++++++--
 1 files changed, 12 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..0ba4ecc 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,22 @@
 	 */
 	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);
+
 }

--
Gitblit v1.8.0