From 59bfbce44674e52aefbe883233ffaea93d750a8f Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 25 十一月 2019 09:56:17 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/TaoBaoWeiQuanOrderMapper.java |  180 ++++++++++++++++++++++++++++++------------------------------
 1 files changed, 90 insertions(+), 90 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 8d6a833..79087f2 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,91 +1,91 @@
-package com.yeshi.fanli.dao.mybatis.taobao;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-
-import com.yeshi.fanli.dto.ChartTDO;
-import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
-
-public interface TaoBaoWeiQuanOrderMapper {
-
-	int deleteByPrimaryKey(Long id);
-
-	int insert(TaoBaoWeiQuanOrder record);
-
-	int insertSelective(TaoBaoWeiQuanOrder record);
-
-	TaoBaoWeiQuanOrder selectByPrimaryKey(Long id);
-
-	int updateByPrimaryKeySelective(TaoBaoWeiQuanOrder record);
-
-	int updateByPrimaryKey(TaoBaoWeiQuanOrder record);
-
-	// 鎸夎鍗曞彿鍜屽瓙璁㈠崟鍙锋煡璇�
-	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<ChartTDO> 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<ChartTDO> 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);
+package com.yeshi.fanli.dao.mybatis.taobao;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.yeshi.fanli.dto.ChartTDO;
+import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
+
+public interface TaoBaoWeiQuanOrderMapper {
+
+	int deleteByPrimaryKey(Long id);
+
+	int insert(TaoBaoWeiQuanOrder record);
+
+	int insertSelective(TaoBaoWeiQuanOrder record);
+
+	TaoBaoWeiQuanOrder selectByPrimaryKey(Long id);
+
+	int updateByPrimaryKeySelective(TaoBaoWeiQuanOrder record);
+
+	int updateByPrimaryKey(TaoBaoWeiQuanOrder record);
+
+	// 鎸夎鍗曞彿鍜屽瓙璁㈠崟鍙锋煡璇�
+	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<ChartTDO> 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<ChartTDO> 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