From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/TaoBaoWeiQuanOrderMapper.java |   61 ++++++++++++++++++++++++++++++
 1 files changed, 61 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/TaoBaoWeiQuanOrderMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/TaoBaoWeiQuanOrderMapper.java
index 9db2e1b..cb049aa 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/TaoBaoWeiQuanOrderMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/TaoBaoWeiQuanOrderMapper.java
@@ -1,6 +1,7 @@
 package com.yeshi.fanli.dao.mybatis.taobao;
 
 import java.util.List;
+import java.util.Map;
 
 import org.apache.ibatis.annotations.Param;
 
@@ -24,7 +25,67 @@
 	TaoBaoWeiQuanOrder selectByOrderIdAndOrderItemId(@Param("orderId") String orderId,
 			@Param("orderItemId") String orderItemId);
 
+	TaoBaoWeiQuanOrder selectByOrderItemId(String orderItemId);
+
 	// 鎸夎鍗曞彿鍜岀淮鏉冪姸鎬佹煡璇�
 	List<TaoBaoWeiQuanOrder> selectListByOrderIdAndState(@Param("orderId") String orderId,
 			@Param("state") String state);
+
+	/**
+	 * 缁熻鎬婚噾棰�
+	 * 
+	 * @param dateType
+	 * @param years
+	 * @param startTime
+	 * @param endTime
+	 * @return
+	 */
+	List<Map<String, Object>> countWeiQaunOrderNumber(@Param("dateType") Integer dateType, @Param("year") String year,
+			@Param("startTime") String startTime, @Param("endTime") String endTime);
+
+	/**
+	 * 缁熻鎬讳釜鏁�
+	 * 
+	 * @param dateType
+	 * @param years
+	 * @param startTime
+	 * @param endTime
+	 * @return
+	 */
+	List<Map<String, Object>> countWeiQaunOrderMoney(@Param("dateType") Integer dateType, @Param("year") String year,
+			@Param("startTime") String startTime, @Param("endTime") String endTime);
+
+	/**
+	 * 鏍规嵁鐘舵�佹绱�
+	 * 
+	 * @param state
+	 * @param start
+	 * @param count
+	 * @return
+	 */
+	List<TaoBaoWeiQuanOrder> listByState(@Param("state") String state, @Param("start") long start,
+			@Param("count") int count);
+
+	/**
+	 * 鏍规嵁鐘舵�佺粺璁℃暟閲�
+	 * 
+	 * @param state
+	 * @return
+	 */
+	long countByState(@Param("state") String state);
+	
+	
+	/**
+	 * 鏍规嵁璁㈠崟鍙锋绱�
+	 * @param orderId
+	 * @return
+	 */
+	List<TaoBaoWeiQuanOrder> listByOrderId(String orderId);
+	
+	/**
+	 * 鏍规嵁瀛愯鍗曞彿妫�绱�
+	 * @param tradeId
+	 * @return
+	 */
+	TaoBaoWeiQuanOrder selectByOrderItem(String tradeId);
 }
\ No newline at end of file

--
Gitblit v1.8.0