From 9eeda0d3049b71877c373c04d65533939b5582ef Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 02 九月 2019 09:55:55 +0800
Subject: [PATCH] getBoss方法只查询有效上级信息

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/taobao/TaoBaoOrderService.java |   95 +++++++++++++++++++++++++++--------------------
 1 files changed, 54 insertions(+), 41 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..1a36f01 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,72 @@
 	 */
 	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;
 
-	
 	/**
-	 * 鏍规嵁璁㈠崟鍙枫�侀噾棰濇煡璇㈣鍗曠姸鎬�
-	 * @param orderId
-	 * @param payment
-	 * @return
-	 * @throws Exception
+	 * 缁戝畾浼氬憳杩愯惀ID涓庢笭閬揑D(鏍规嵁浜ゆ槗ID)
+	 * 
+	 * @param tadeId
+	 * @param specialId
+	 * @param realtionId
 	 */
-	public List<TaoBaoOrder> getStateByOrderIdAndPayment(String orderId, String payment) throws Exception;
+	public void bindSpecialIdAndRealtionId(String tradeId, String specialId, String realtionId);
 
-	
 	/**
-	 * 鍚庣鏌ヨ鍟嗗搧鍒楄〃
-	 * @param start
-	 * @param count
-	 * @param keyType
-	 * @param key
-	 * @param startTime
-	 * @param endTime
-	 * @param state
+	 * 鏍规嵁浜ゆ槗ID鑾峰彇璁㈠崟鍙�
+	 * 
+	 * @param tradeId
 	 * @return
-	 * @throws Exception
 	 */
-	public List<TaoBaoOrderVO> listQuery(int start, int count, String key, String startTime, String endTime,
-			Integer state) throws Exception;
+	public TaoBaoOrder selectByTradeId(String tradeId);
 
-	public long countQuery(String key, String startTime, String endTime, Integer state) throws Exception;
+	/**
+	 * 妫�绱㈡墍鏈夎鍗曞垪琛�
+	 * 
+	 * @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);
+
+	/**
+	 * 鏍规嵁缁撶畻鏃堕棿妫�绱�
+	 * 
+	 * @param page
+	 * @param pageSize
+	 * @return
+	 */
+	public List<TaoBaoOrder> listBySettlementTime(Long minTime, Long maxTime, int page, int pageSize);
+
+	/**
+	 * 鏍规嵁缁撶畻鏃堕棿璁℃暟
+	 * 
+	 * @param minTime
+	 * @param maxTime
+	 * @return
+	 */
+	public Long countBySettlementTime(Long minTime, Long maxTime);
 
 }

--
Gitblit v1.8.0