From fb1d948a7b64cd02083b7b6f7ae18d16ad638609 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 13 十二月 2019 18:28:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java
index aa40d8d..9887052 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java
@@ -219,7 +219,8 @@
* @return
*/
BigDecimal getRewardMoneyByDate(@Param("uid") Long uid, @Param("day")Integer dateType,
- @Param("type") Integer hbType, @Param("orderState") Integer orderState);
-
-
+ @Param("type") Integer hbType, @Param("orderState") Integer orderState,
+ @Param("orderNo") String orderNo, @Param("moneyState") Integer moneyState,
+ @Param("source") Integer source,
+ @Param("startTime") String startTime, @Param("endTime") String endTime);
}
\ No newline at end of file
--
Gitblit v1.8.0