From 77b64e9c3a590e47c630f7b65ef08687a790417e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 07 一月 2019 11:59:39 +0800
Subject: [PATCH] Merge branch 'dev-hongbao'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/config/InviteGetMoneyServiceImpl.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/config/InviteGetMoneyServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/config/InviteGetMoneyServiceImpl.java
index fe9836d..be29535 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/config/InviteGetMoneyServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/config/InviteGetMoneyServiceImpl.java
@@ -160,7 +160,11 @@
@Override
public BigDecimal getMoneyLastMonth(String uid) {
- return shareMapper.getMoneyLastMonth(uid);
+ BigDecimal money = shareMapper.getMoneyLastMonth(uid);
+ if (money == null)
+ return new BigDecimal(0);
+ else
+ return money;
}
@Override
@@ -172,20 +176,19 @@
public void editActivityRules(String value, String key) {
shareMapper.editActivityRules(value, key);
}
-
+
@Override
public List<SpreadImg> listQuery(int start, int pageSize, String key) {
if (StringUtil.isNullOrEmpty(key)) {
- return spreadImgDao.list("from SpreadImg si order by si.createtime desc", start,
- pageSize, new Serializable[] {});
+ return spreadImgDao.list("from SpreadImg si order by si.createtime desc", start, pageSize,
+ new Serializable[] {});
} else {
return spreadImgDao.list("from SpreadImg si where si.url like ? order by si.createtime desc", start,
pageSize, new Serializable[] { "%" + key + "%" });
}
}
-
@Override
public long countQuery(String key) {
--
Gitblit v1.8.0