|
|
@@ -162,24 +162,24 @@ public class UserController {
|
|
|
if (user != null) {
|
|
|
user.setLoginRecordList(loginRecordMapper.getLoginRecords(userId));
|
|
|
user.setNovelAdRecordList(novelAdRecordMapper.selectToDayNovelRecode(userId));
|
|
|
- }
|
|
|
- // 分层系数
|
|
|
- WxDefaultConfig defaultConfig = appUserMapper.getDefaultConfigByAppId(user.getAppId());
|
|
|
- String revenueDisplayRate = defaultConfig == null ? "" : defaultConfig.getRevenueDisplayRate();
|
|
|
- BigDecimal todayRevenue = adRecordMapper.getToTalRevenue(userId, 1);
|
|
|
- BigDecimal totalRevenue = user.getTotalIncome() == null ? adRecordMapper.getToTalRevenue(userId, 2) : user.getTotalIncome();
|
|
|
- if (StrUtil.isNotEmpty(revenueDisplayRate)) {
|
|
|
- BigDecimal rate = NumberUtils.rateToBigDecimal(revenueDisplayRate);
|
|
|
- todayRevenue = todayRevenue.multiply(rate).setScale(revenueScale, RoundingMode.HALF_UP);
|
|
|
- totalRevenue = totalRevenue.multiply(rate).setScale(revenueScale, RoundingMode.HALF_UP);
|
|
|
- }
|
|
|
- // 今日收益
|
|
|
- user.setTodayIncome(todayRevenue);
|
|
|
- // 历史收益
|
|
|
- user.setTotalIncome(totalRevenue);
|
|
|
- // 前三日总收益
|
|
|
- if (user.getNearlyIncome() != null) {
|
|
|
- user.setNearlyIncome(user.getNearlyIncome().setScale(revenueScale, RoundingMode.HALF_UP));
|
|
|
+ // 分层系数
|
|
|
+ WxDefaultConfig defaultConfig = appUserMapper.getDefaultConfigByAppId(user.getAppId());
|
|
|
+ String revenueDisplayRate = defaultConfig == null ? "" : defaultConfig.getRevenueDisplayRate();
|
|
|
+ BigDecimal todayRevenue = adRecordMapper.getToTalRevenue(userId, 1);
|
|
|
+ BigDecimal totalRevenue = user.getTotalIncome() == null ? adRecordMapper.getToTalRevenue(userId, 2) : user.getTotalIncome();
|
|
|
+ if (StrUtil.isNotEmpty(revenueDisplayRate)) {
|
|
|
+ BigDecimal rate = NumberUtils.rateToBigDecimal(revenueDisplayRate);
|
|
|
+ todayRevenue = todayRevenue.multiply(rate).setScale(revenueScale, RoundingMode.HALF_UP);
|
|
|
+ totalRevenue = totalRevenue.multiply(rate).setScale(revenueScale, RoundingMode.HALF_UP);
|
|
|
+ }
|
|
|
+ // 今日收益
|
|
|
+ user.setTodayIncome(todayRevenue);
|
|
|
+ // 历史收益
|
|
|
+ user.setTotalIncome(totalRevenue);
|
|
|
+ // 前三日总收益
|
|
|
+ if (user.getNearlyIncome() != null) {
|
|
|
+ user.setNearlyIncome(user.getNearlyIncome().setScale(revenueScale, RoundingMode.HALF_UP));
|
|
|
+ }
|
|
|
}
|
|
|
return Result.resultObjOk(user);
|
|
|
}
|