From 5ca8157adb3236d7817b487a5ff6f4efa12006d2 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 25 十一月 2019 14:25:27 +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/HongBaoV2Mapper.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2Mapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2Mapper.java
index 2d46519..7143fd7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2Mapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2Mapper.java
@@ -154,7 +154,7 @@
* @return
*/
Long countInviteOrderCountByUidAndSettleTime(@Param("uid") Long uid, @Param("state") int state,
- @Param("minDate") Date minDate, @Param("maxDate") Date maxDate);
+ @Param("minDate") Date minDate, @Param("maxDate") Date maxDate,@Param("orderType") int orderType);
/**
* 鏍规嵁鐢ㄦ埛ID锛岃鍗曠姸鎬佸拰缁撶畻鏃堕棿缁熻鍒嗕韩璧氱殑璁㈠崟鏁伴噺
@@ -165,7 +165,7 @@
* @return
*/
Long countShareOrderCountByUidAndSettleTime(@Param("uid") Long uid, @Param("state") int state,
- @Param("minDate") Date minDate, @Param("maxDate") Date maxDate);
+ @Param("minDate") Date minDate, @Param("maxDate") Date maxDate,@Param("orderType") Integer orderType);
/**
* 閫氳繃鐢ㄦ埛ID鍜岀姸鎬佹煡璇㈡暟閲�
--
Gitblit v1.8.0