From c8f11c229b87d1652b6da0b15576c166cd51eb8b Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期三, 01 一月 2020 14:25:22 +0800 Subject: [PATCH] 首页悬浮图mapperbug修改，增加商品详情中的比例展示 --- fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMoneyController.java | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMoneyController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMoneyController.java index cb26b1a..e524050 100644 --- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMoneyController.java +++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMoneyController.java @@ -31,12 +31,12 @@ import com.yeshi.fanli.entity.money.UserMoneyDetail.UserMoneyDetailTypeEnum; import com.yeshi.fanli.exception.user.UserInfoExtraException; import com.yeshi.fanli.service.inter.config.ConfigService; +import com.yeshi.fanli.service.inter.count.HongBaoV2CountService; import com.yeshi.fanli.service.inter.money.UserMoneyDetailService; import com.yeshi.fanli.service.inter.money.extract.ExtractService; import com.yeshi.fanli.service.inter.order.HongBaoV2Service; import com.yeshi.fanli.service.inter.user.UserInfoExtraService; import com.yeshi.fanli.service.inter.user.UserInfoService; -import com.yeshi.fanli.util.MoneyBigDecimalUtil; import com.yeshi.fanli.util.StringUtil; import com.yeshi.fanli.util.TimeUtil; import com.yeshi.fanli.util.VersionUtil; @@ -72,6 +72,9 @@ @Resource private ConfigService configService; + + @Resource + private HongBaoV2CountService hongBaoV2CountService; /** * 鏂扮増璧勯噾璇︽儏锛�1.4.9锛� @@ -289,8 +292,16 @@ maxDate = new Date( TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(ca.getTimeInMillis(), "yyyy-MM"), "yyyy-MM")); - // 鏈湀鏈埌璐� - vo.setMonthUnRecievedMoney(hongBaoV2Service.getUnRecievedMoneyWithPreGetTime(uid, minDate, maxDate)); + // 鏈湀鏈埌璐�,浠pp绔垜鐨勯〉闈笂鏈堟敹鐩婁负鍑� + + BigDecimal selfMoney = hongBaoV2CountService.getRewardMoneyToCount(uid, 4, 1); + BigDecimal shareMoney = hongBaoV2CountService.getRewardMoneyToCount(uid, 4, 2); + BigDecimal inviteMoney = hongBaoV2CountService.getRewardMoneyToCount(uid, 4, 3); + + + BigDecimal monthUnRecievedMoney = selfMoney.setScale(2, BigDecimal.ROUND_DOWN) + .add(shareMoney.setScale(2, BigDecimal.ROUND_DOWN)).add(inviteMoney.setScale(2, BigDecimal.ROUND_DOWN)); + vo.setMonthUnRecievedMoney(monthUnRecievedMoney); // 鍏ㄩ儴鏈埌璐� minDate = new Date(0); -- Gitblit v1.8.0