Merge branch 'dev-hongbao'

admin

2019-01-09 baacd1378b33c4a84ee7a4998fb08fd9979ee4e1

 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(