From 2e0c2025f430623b66c950f022dae05eb9d17e15 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期五, 27 九月 2019 00:07:21 +0800
Subject: [PATCH] 测试代码添加

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java |   29 +++++++++++++++++++++++++----
 1 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java
index 6198ab8..ea15e8c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java
@@ -85,9 +85,9 @@
 	 * @param uid
 	 * @return
 	 */
-	Map<String, BigDecimal> countByUidAndOrderState(@Param("uid") Long uid, @Param("type") Integer type,
+	long countUserOrderToApp(@Param("uid") Long uid, @Param("type") Integer type,
 			@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("day") Integer day,
-			@Param("source") Integer source);
+			@Param("source") Integer source,@Param("state") Integer state, @Param("stateOrder") Integer stateOrder);
 
 	/**
 	 * 濂栭噾璁㈠崟鏁伴噺
@@ -258,6 +258,16 @@
 	List<CommonOrder> listBySourceTypeAndTradeId(@Param("sourceType") int sourceType, @Param("tradeId") String tradeId);
 
 	/**
+	 * 鏍规嵁鏉ユ簮鍜屼氦鏄揑D鑾峰彇璁㈠崟鍒楄〃
+	 * 
+	 * @param sourceType
+	 * @param tradeIdList
+	 * @return
+	 */
+	List<CommonOrder> listBySourceTypeAndTradeIdList(@Param("sourceType") int sourceType,
+			@Param("tradeIdList") List<String> tradeIdList);
+
+	/**
 	 * 
 	 * @param sourceType
 	 * @param state
@@ -270,13 +280,24 @@
 	List<CommonOrder> listBySourceTypeAndStateAndThirdCrateTime(@Param("sourceType") int sourceType,
 			@Param("state") Integer state, @Param("minTime") Long minTime, @Param("maxTime") Long maxTime,
 			@Param("start") long start, @Param("count") int count);
-	
-	
+
 	/**
 	 * 鏍规嵁璁㈠崟鍙锋煡璇�
+	 * 
 	 * @param orderNO
 	 * @return
 	 */
 	List<CommonOrder> getByOrderNo(@Param("uid") Long uid, @Param("orderNo") String orderNo);
 
+	
+	/**
+	 * 鏍规嵁鐢ㄦ埛ID鏌ヨ
+	 * @param uid
+	 * @param stateList
+	 * @param start
+	 * @param count
+	 * @return
+	 */
+	List<CommonOrder> listByUid(@Param("uid")Long uid,@Param("stateList") List<Integer> stateList,@Param("start") long start,@Param("count") int count);
+
 }
\ No newline at end of file

--
Gitblit v1.8.0