From 712fb305d6f79961e879a2f543107e19d7f9e8a2 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 11 五月 2020 10:08:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/dividents/TeamDividentsSourceOrderMapper.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/dividents/TeamDividentsSourceOrderMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/dividents/TeamDividentsSourceOrderMapper.java
index d06770f..d28d595 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/dividents/TeamDividentsSourceOrderMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/dividents/TeamDividentsSourceOrderMapper.java
@@ -25,7 +25,8 @@
* @throws
*/
List<TeamDividentsSourceOrder> lisByUidAndPreSendTimeAndState(@Param("uid") Long uid,
- @Param("preSendTime") Date preSendTime, @Param("state") int state, @Param("start") long start, @Param("count") int count);
+ @Param("preSendTime") Date preSendTime, @Param("state") int state, @Param("start") long start,
+ @Param("count") int count);
long countByUidAndPreSendTimeAndState(@Param("uid") Long uid, @Param("preSendTime") Date preSendTime,
@Param("state") int state);
@@ -58,7 +59,8 @@
* int 杩斿洖绫诲瀷
* @throws
*/
- int setStateByUidAndState(@Param("uid") Long uid, @Param("targetState") int targetState, @Param("state") int state, @Param("beiZhu") String beiZhu);
+ int setStateByUidAndState(@Param("uid") Long uid, @Param("targetState") int targetState, @Param("state") int state,
+ @Param("beiZhu") String beiZhu);
/**
* 鏍规嵁璁㈠崟淇℃伅妫�绱�
@@ -73,4 +75,7 @@
TeamDividentsSourceOrder selectByOrderNoAndSourceType(@Param("orderNo") String orderNo,
@Param("sourceType") int sourceType);
+ List<TeamDividentsSourceOrder> listByOrderNoOrSourceUid(@Param("orderNo") String orderNo, @Param("uid") Long uid,
+ @Param("start") long start, @Param("count") int count);
+
}
\ No newline at end of file
--
Gitblit v1.8.0