From c0284d7ae6d59aa1146aa5d4123ec7c4b44892da Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 02 十二月 2019 14:00:31 +0800
Subject: [PATCH] 新人红包 + 品牌随机

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java
index 0b0dfc0..706c81c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java
@@ -8,6 +8,7 @@
 
 import javax.annotation.Resource;
 
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
 import org.yeshi.utils.DateUtil;
 
@@ -344,8 +345,15 @@
 	}
 	
 	@Override
-	public BigDecimal getRewardMoneyByDate(Long uid, Integer dateType, Integer hbType, Integer orderState) {
-		return hongBaoV2CountMapper.getRewardMoneyByDate(uid, dateType, hbType, orderState);
+	public BigDecimal getRewardMoneyToCount(Long uid, Integer dateType, Integer hbType) {
+		return hongBaoV2CountMapper.getRewardMoneyByDate(uid, dateType, hbType, null, null, null, null, null);
+	}
+	
+	
+	@Override
+	public BigDecimal getRewardMoneyByToSearch(Long uid, Integer dateType, Integer hbType, Integer orderState, String orderNo, Integer source, String startTime,  String endTime) {
+		return hongBaoV2CountMapper.getRewardMoneyByDate(uid, dateType, hbType, orderState, orderNo, source,
+				startTime, endTime);
 	}
 	
 }

--
Gitblit v1.8.0