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 |   60 ++++++++++++++++--------------------------------------------
 1 files changed, 16 insertions(+), 44 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 773508a..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
@@ -2,9 +2,7 @@
 
 import java.util.List;
 
-import com.yeshi.fanli.entity.admin.ReslutOrder;
 import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
-import com.yeshi.fanli.vo.order.TaoBaoOrderVO;
 
 /**
  * 娣樺疂璁㈠崟鏈嶅姟
@@ -39,57 +37,31 @@
 	 */
 	public List<TaoBaoOrder> getTaoBaoOrderByOrderId(String orderId);
 
-	
-	
-	/**
-	 * 鏌ヨ璁㈠崟--鍏宠仈绾㈠寘
-	 * @param start
-	 * @param count
-	 * @param key
-	 * @param startTime
-	 * @param endTime
-	 * @param type
-	 * @param days
-	 * @return
-	 */
-	public List<ReslutOrder> queryJoinHongBao(int start, int count, String key, String startTime, String endTime, Integer type, Integer days) throws Exception;
-
-	public int countQueryJoinHongBao(String key, String startTime, String endTime, Integer type, Integer days) throws Exception;
-	
-	
 	/**
 	 * 缁熻褰撴棩棰勪及鏀剁泭
-	 * @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);
+	
+	
 	
 	/**
-	 * 鏍规嵁璁㈠崟鍙枫�侀噾棰濇煡璇㈣鍗曠姸鎬�
-	 * @param orderId
-	 * @param payment
+	 * 鏍规嵁浜ゆ槗ID鑾峰彇璁㈠崟鍙�
+	 * @param tradeId
 	 * @return
-	 * @throws Exception
 	 */
-	public List<TaoBaoOrder> getStateByOrderIdAndPayment(String orderId, String payment) throws Exception;
-
-	
-	/**
-	 * 鍚庣鏌ヨ鍟嗗搧鍒楄〃
-	 * @param start
-	 * @param count
-	 * @param keyType
-	 * @param key
-	 * @param startTime
-	 * @param endTime
-	 * @param state
-	 * @return
-	 * @throws Exception
-	 */
-	public List<TaoBaoOrderVO> listQuery(int start, int count, String key, String startTime, String endTime,
-			Integer state) throws Exception;
-
-	public long countQuery(String key, String startTime, String endTime, Integer state) throws Exception;
+	public TaoBaoOrder selectByTradeId(String tradeId);
 
 }

--
Gitblit v1.8.0