From 20f1758957a19bb5fec47fcc1c83818ee268676b Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期五, 11 一月 2019 14:16:07 +0800 Subject: [PATCH] 修改资金统计信息，优化H5的商品详情 --- fanli/src/main/java/com/yeshi/fanli/controller/client/UserMoneyController.java | 16 +++++++++++++++- 1 files changed, 15 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 eed7f9e..95a9553 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锛� @@ -226,7 +230,7 @@ typeList.add(UserMoneyDetailTypeEnum.invite); typeList.add(UserMoneyDetailTypeEnum.inviteWeiQuan); typeList.add(UserMoneyDetailTypeEnum.inviteAndShare); - + minDate = new Date(0L); maxDate = new Date(timeStamp); vo.setTotalInviteMoney( @@ -254,6 +258,16 @@ vo.setTotalShareMoney( userMoneyDetailService.statisticUserTypeMoneyWithDate(uid, typeList, minDate, maxDate).abs()); + + maxDate = new Date(timeStamp); + minDate = new Date(TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(timeStamp, "yyyy-MM"), "yyyy-MM")); + + // 鏈湀鏈埌璐� + vo.setMonthUnRecievedMoney(hongBaoV2Service.getUnRecievedMoneyWithCreateTime(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