From 88b54772dbcf5ecab1e2316e4e4626ac901b8908 Mon Sep 17 00:00:00 2001 From: yujian <yujian> Date: 星期二, 22 一月 2019 15:58:24 +0800 Subject: [PATCH] 邀请码添加返回状态 --- fanli/src/main/java/com/yeshi/fanli/controller/client/UserMoneyController.java | 21 ++++++++++++++++++++- 1 files changed, 20 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..8cface0 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 @@ -26,6 +26,7 @@ import com.google.gson.stream.JsonWriter; import com.yeshi.fanli.entity.accept.AcceptData; import com.yeshi.fanli.entity.money.UserMoneyDetail.UserMoneyDetailTypeEnum; +import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service; import com.yeshi.fanli.service.inter.user.UserInfoService; import com.yeshi.fanli.service.inter.user.UserMoneyDetailService; import com.yeshi.fanli.util.MoneyBigDecimalUtil; @@ -51,6 +52,9 @@ @Resource private UserInfoService userInfoService; + + @Resource + private HongBaoV2Service hongBaoV2Service; /** * 鏂扮増璧勯噾璇︽儏锛�1.4.9锛� @@ -147,7 +151,7 @@ return; } - BigDecimal balance = userInfoService.getMyHB(uid); + BigDecimal balance = userInfoService.getUserById(uid).getMyHongBao(); UserMoneyStatisticVO vo = new UserMoneyStatisticVO(); vo.setBalanceMoney(balance); @@ -225,6 +229,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( @@ -252,6 +258,19 @@ vo.setTotalShareMoney( userMoneyDetailService.statisticUserTypeMoneyWithDate(uid, typeList, minDate, maxDate).abs()); + + minDate = new Date(TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(timeStamp, "yyyy-MM"), "yyyy-MM")); + Calendar ca = Calendar.getInstance(); + ca.setTime(new Date(timeStamp)); + ca.add(Calendar.MONTH, 1); + maxDate = new Date(ca.getTimeInMillis()); + + // 鏈湀鏈埌璐� + vo.setMonthUnRecievedMoney(hongBaoV2Service.getUnRecievedMoneyWithPreGetTime(uid, minDate, maxDate)); + + // 鍏ㄩ儴鏈埌璐� + minDate = new Date(0); + vo.setTotalUnRecievedMoney(hongBaoV2Service.getUnRecievedMoneyWithCreateTime(uid, minDate, maxDate)); Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create(); out.print(JsonUtil.loadTrueResult(gson.toJson(vo))); } -- Gitblit v1.8.0