From f5444c6b777ba9f1e0825066e9d12fb9ce4f9f72 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 18 五月 2020 16:13:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java | 5 ++++-
1 files changed, 4 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 df705bc..8704f84 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
@@ -150,7 +150,10 @@
@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);
+ BigDecimal money = hongBaoV2CountMapper.getRewardMoneyByDate(uid, dateType, hbType, null, null, null, null, null, listSource);
+ if (money == null)
+ money = BigDecimal.ZERO;
+ return money;
}
@Override
--
Gitblit v1.8.0