From 6f14a131b39c8fc44b29b6130c4e2002bbf2d3ca Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期日, 29 九月 2019 14:51:23 +0800
Subject: [PATCH] 返利奖励券H5接口增加

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/TaoBaoOrderMapper.java |   98 +++++++++++++++++++++++++++++++++++++------------
 1 files changed, 74 insertions(+), 24 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/TaoBaoOrderMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/TaoBaoOrderMapper.java
index 5576e3f..5720897 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/TaoBaoOrderMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/TaoBaoOrderMapper.java
@@ -19,9 +19,11 @@
 
 	// 閫氳繃璁㈠崟鍙疯幏鍙栬鍗曞垪琛�
 	List<TaoBaoOrder> selectTaoBaoOrderByOrderId(String orderId);
-	
+
 	// 閫氳繃浜ゆ槗ID鑾峰彇璁㈠崟
 	TaoBaoOrder selectTaoBaoOrderByTradeId(String tradeId);
+
+	List<TaoBaoOrder> listByTradeId(String tradeId);
 
 	int updateByPrimaryKeySelective(TaoBaoOrder record);
 
@@ -29,57 +31,105 @@
 
 	// 鏍规嵁璁㈠崟鍙峰垹闄ゆ暟鎹�
 	int deleteByOrderId(String orderId);
-	
-	
+
 	/**
 	 * 缁熻--璁㈠崟绫诲瀷鍖哄垎
+	 * 
 	 * @return
 	 */
 	Map<String, Object> countByOdrerType();
-	
-	
+
 	/**
 	 * 缁熻浠婃棩璁㈠崟
+	 * 
 	 * @return
 	 */
 	int countToday();
-	
+
 	/**
 	 * 缁熻鏄ㄦ棩璁㈠崟
+	 * 
 	 * @return
 	 */
 	int countYesterday();
-	
-	
+
 	/**
 	 * 缁熻褰撴棩棰勪及鏀剁泭
-	 * @param date  2018-09-01
+	 * 
+	 * @param date
+	 *            2018-09-01
 	 * @return
 	 */
-	double countEstimate(@Param("date")String date);
-	
-	
-	
-	List<TaoBaoOrder> getStateByOrderIdAndPayment(@Param("orderId")String orderId, @Param("payment")String payment);
-	
-	
+	double countEstimate(@Param("date") String date);
+
+	List<TaoBaoOrder> getStateByOrderIdAndPayment(@Param("orderId") String orderId, @Param("payment") String payment);
+
 	TaoBaoOrder selectLatestByAuctionId(long auctionId);
-	
-	
+
 	/**
-	 *  缁熻鎵�鏈夎鍗�
+	 * 缁熻鎵�鏈夎鍗�
+	 * 
 	 * @param channel
 	 * @return
 	 */
-	List<Map<String, Object>> countOrderNumber( @Param("dateType") Integer dateType, @Param("year") String year, 
-			@Param("startTime")String startTime, @Param("endTime")String endTime);
-	
-	
+	List<Map<String, Object>> countOrderNumber(@Param("dateType") Integer dateType, @Param("year") String year,
+			@Param("startTime") String startTime, @Param("endTime") String endTime);
+
 	/**
 	 * 鑾峰彇闀挎湡鏈洿鏂扮殑璁㈠崟
+	 * 
 	 * @param start
 	 * @param count
 	 * @return
 	 */
-	List<TaoBaoOrder> listLongTimeNoUpdateOrders(@Param("start")long start,@Param("count")int count);
+	List<TaoBaoOrder> listLongTimeNoUpdateOrders(@Param("start") long start, @Param("count") int count);
+
+	/**
+	 * 鑾峰彇鎵�鏈夎鍗曞垪琛�
+	 * 
+	 * @param orderNo
+	 * @param start
+	 * @param count
+	 * @return
+	 */
+	List<TaoBaoOrder> listAllOrder(@Param("orderNo") String orderNo, @Param("start") long start,
+			@Param("count") int count);
+
+	/**
+	 * 鎵�鏈夎鍗曟暟閲�
+	 * 
+	 * @param orderNo
+	 * @return
+	 */
+	long countAllOrder(@Param("orderNo") String orderNo);
+
+	/**
+	 * 鏍规嵁缁撶畻鏃堕棿鎷兼帓搴�
+	 * 
+	 * @param start
+	 * @param count
+	 * @return
+	 */
+	List<TaoBaoOrder> listBySettlementTime(@Param("minTime") Long minTime, @Param("maxTime") Long maxTime,
+			@Param("start") long start, @Param("count") int count);
+
+	/**
+	 * 鏍规嵁缁撶畻鏃堕棿璁℃暟
+	 * 
+	 * @param minTime
+	 * @param maxTime
+	 * @return
+	 */
+	Long countBySettlementTime(@Param("minTime") Long minTime, @Param("maxTime") Long maxTime);
+
+	/**
+	 * 鏍规嵁鐘舵�佷笌鍒涘缓鏃堕棿妫�绱�
+	 * 
+	 * @param state
+	 * @param minCreateTime
+	 * @param maxCreateTime
+	 * @return
+	 */
+	List<TaoBaoOrder> listByStateAndCreateTime(@Param("state") String state, @Param("minCreateTime") Long minCreateTime,
+			@Param("maxCreateTime") Long maxCreateTime);
 }
\ No newline at end of file

--
Gitblit v1.8.0