From 4ea48ee6d71a4877aa2644ecf3c4758e26a91149 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 09 九月 2019 14: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/order/CommonOrderMapper.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 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 ad2a954..d38221e 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
@@ -256,17 +256,16 @@
* @return
*/
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);
-
-
+ List<CommonOrder> listBySourceTypeAndTradeIdList(@Param("sourceType") int sourceType,
+ @Param("tradeIdList") List<String> tradeIdList);
/**
*
@@ -281,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