From 88c7df1d5089d8e39f356a68eaccc18f308e190c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 24 三月 2020 12:10:07 +0800
Subject: [PATCH] Merge branch 'div' into div-1
---
fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 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 d6a4642..50dec95 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
@@ -172,7 +172,7 @@
@Override
- public Integer countOrderByTypeAndDate(Integer orderType, String preDay) {
+ public Long countOrderByTypeAndDate(Integer orderType, String preDay) {
return hongBaoV2CountMapper.countOrderByTypeAndDate(orderType, preDay);
}
@@ -357,6 +357,17 @@
return count;
}
+
+ @Override
+ public long counOrderByUidAndOrderType(Long uid, BigDecimal payment,int type) {
+ Long count = hongBaoV2CountMapper.counOrderByUidAndOrderType(uid, payment, type);
+ if (count == null) {
+ count = 0L;
+ }
+ return count;
+ }
+
+
@Override
public BigDecimal getRewardMoneyToCount(Long uid, Integer dateType, Integer hbType, List<Integer> listSource) {
return hongBaoV2CountMapper.getRewardMoneyByDate(uid, dateType, hbType, null, null, null, null, null, listSource);
--
Gitblit v1.8.0