From 925861e4fd0985cba058f9da37fb217aa35cf265 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 07 一月 2019 14:54:26 +0800
Subject: [PATCH] Merge branch 'dev-hongbao'

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/UserMoneyController.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserMoneyController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserMoneyController.java
index 43a9ed1..eed7f9e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserMoneyController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserMoneyController.java
@@ -147,7 +147,7 @@
 			return;
 		}
 
-		BigDecimal balance = userInfoService.getMyHB(uid);
+		BigDecimal balance = userInfoService.getUserById(uid).getMyHongBao();
 
 		UserMoneyStatisticVO vo = new UserMoneyStatisticVO();
 		vo.setBalanceMoney(balance);
@@ -225,6 +225,8 @@
 		typeList.clear();
 		typeList.add(UserMoneyDetailTypeEnum.invite);
 		typeList.add(UserMoneyDetailTypeEnum.inviteWeiQuan);
+		typeList.add(UserMoneyDetailTypeEnum.inviteAndShare);
+		
 		minDate = new Date(0L);
 		maxDate = new Date(timeStamp);
 		vo.setTotalInviteMoney(

--
Gitblit v1.8.0