后台-幸运24-运营数据统计-屏蔽每日明细
This commit is contained in:
@@ -463,13 +463,13 @@ public class Lucky24RecordAdminService {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
|
||||
List<Lucky24OperatorPersonalStatVo> voList = new ArrayList<>(statList.stream().map(stat -> {
|
||||
BigDecimal receiverReward = BigDecimal.valueOf(stat.getTotalInput()).multiply(receiverRewardRatio);
|
||||
BigDecimal production = BigDecimal.valueOf(stat.getTotalInput()).multiply(inputRatio).subtract(BigDecimal.valueOf(stat.getTotalInput()));
|
||||
BigDecimal productionRatio = stat.getTotalOutput() > 0L ?(receiverReward.add(BigDecimal.valueOf(stat.getTotalInput())))
|
||||
.divide(BigDecimal.valueOf(stat.getTotalOutput()), 4, RoundingMode.HALF_UP): BigDecimal.ZERO;
|
||||
return new Lucky24OperatorPersonalStatVo(stat.getDate(), partitionEnum.getId(), uid, erbanNo, userRechargeLevel, stat.getTotalInput(), stat.getTotalOutput(), receiverReward.longValue(), production, productionRatio);
|
||||
}).sorted(Comparator.comparing(Lucky24OperatorPersonalStatVo::getDate).reversed()).toList());
|
||||
// List<Lucky24OperatorPersonalStatVo> voList = new ArrayList<>(statList.stream().map(stat -> {
|
||||
// BigDecimal receiverReward = BigDecimal.valueOf(stat.getTotalInput()).multiply(receiverRewardRatio);
|
||||
// BigDecimal production = BigDecimal.valueOf(stat.getTotalInput()).multiply(inputRatio).subtract(BigDecimal.valueOf(stat.getTotalInput()));
|
||||
// BigDecimal productionRatio = stat.getTotalOutput() > 0L ?(receiverReward.add(BigDecimal.valueOf(stat.getTotalInput())))
|
||||
// .divide(BigDecimal.valueOf(stat.getTotalOutput()), 4, RoundingMode.HALF_UP): BigDecimal.ZERO;
|
||||
// return new Lucky24OperatorPersonalStatVo(stat.getDate(), partitionEnum.getId(), uid, erbanNo, userRechargeLevel, stat.getTotalInput(), stat.getTotalOutput(), receiverReward.longValue(), production, productionRatio);
|
||||
// }).sorted(Comparator.comparing(Lucky24OperatorPersonalStatVo::getDate).reversed()).toList());
|
||||
|
||||
long totalInput = statList.stream().mapToLong(Lucky24PersonalStat::getTotalInput).sum();
|
||||
long totalOutput = statList.stream().mapToLong(Lucky24PersonalStat::getTotalOutput).sum();
|
||||
@@ -478,6 +478,7 @@ public class Lucky24RecordAdminService {
|
||||
BigDecimal productionRatio = (receiverReward.add(BigDecimal.valueOf(totalOutput))).divide(BigDecimal.valueOf(totalInput), 4, RoundingMode.HALF_UP);
|
||||
Lucky24OperatorPersonalStatVo totalVo = new Lucky24OperatorPersonalStatVo("汇总", partitionEnum.getId(), uid, erbanNo, userRechargeLevel, totalInput, totalOutput, receiverReward.longValue(), production, productionRatio);
|
||||
|
||||
List<Lucky24OperatorPersonalStatVo> voList = new ArrayList<>();
|
||||
voList.add(0, totalVo);
|
||||
return voList;
|
||||
}
|
||||
@@ -522,19 +523,19 @@ public class Lucky24RecordAdminService {
|
||||
|
||||
dateStrList.add(endDate);
|
||||
|
||||
List<Lucky24OperatorPersonalStatVo> voList = new ArrayList<>(dateStrList.stream().map(dateStr -> {
|
||||
Lucky24PersonalStat stat = statMap.get(dateStr);
|
||||
if (null == stat){
|
||||
return new Lucky24OperatorPersonalStatVo(dateStr, partitionEnum.getId(), uid, erbanNo, userRechargeLevel,
|
||||
BigDecimal.ZERO.longValue(), BigDecimal.ZERO.longValue(), BigDecimal.ZERO.longValue(), BigDecimal.ZERO, BigDecimal.ZERO);
|
||||
}
|
||||
|
||||
BigDecimal receiverReward = BigDecimal.valueOf(stat.getTotalInput()).multiply(receiverRewardRatio);
|
||||
BigDecimal production = BigDecimal.valueOf(stat.getTotalInput()).multiply(inputRatio).subtract(BigDecimal.valueOf(stat.getTotalInput()));
|
||||
BigDecimal productionRatio = stat.getTotalOutput() > 0L?
|
||||
(receiverReward.add(BigDecimal.valueOf(stat.getTotalInput()))).divide(BigDecimal.valueOf(stat.getTotalOutput()), 4, RoundingMode.HALF_UP): BigDecimal.ZERO;
|
||||
return new Lucky24OperatorPersonalStatVo(stat.getDate(), partitionEnum.getId(), uid, erbanNo, userRechargeLevel, stat.getTotalInput(), stat.getTotalOutput(), receiverReward.longValue(), production, productionRatio);
|
||||
}).sorted(Comparator.comparing(Lucky24OperatorPersonalStatVo::getDate).reversed()).toList());
|
||||
// List<Lucky24OperatorPersonalStatVo> voList = new ArrayList<>(dateStrList.stream().map(dateStr -> {
|
||||
// Lucky24PersonalStat stat = statMap.get(dateStr);
|
||||
// if (null == stat){
|
||||
// return new Lucky24OperatorPersonalStatVo(dateStr, partitionEnum.getId(), uid, erbanNo, userRechargeLevel,
|
||||
// BigDecimal.ZERO.longValue(), BigDecimal.ZERO.longValue(), BigDecimal.ZERO.longValue(), BigDecimal.ZERO, BigDecimal.ZERO);
|
||||
// }
|
||||
//
|
||||
// BigDecimal receiverReward = BigDecimal.valueOf(stat.getTotalInput()).multiply(receiverRewardRatio);
|
||||
// BigDecimal production = BigDecimal.valueOf(stat.getTotalInput()).multiply(inputRatio).subtract(BigDecimal.valueOf(stat.getTotalInput()));
|
||||
// BigDecimal productionRatio = stat.getTotalOutput() > 0L?
|
||||
// (receiverReward.add(BigDecimal.valueOf(stat.getTotalInput()))).divide(BigDecimal.valueOf(stat.getTotalOutput()), 4, RoundingMode.HALF_UP): BigDecimal.ZERO;
|
||||
// return new Lucky24OperatorPersonalStatVo(stat.getDate(), partitionEnum.getId(), uid, erbanNo, userRechargeLevel, stat.getTotalInput(), stat.getTotalOutput(), receiverReward.longValue(), production, productionRatio);
|
||||
// }).sorted(Comparator.comparing(Lucky24OperatorPersonalStatVo::getDate).reversed()).toList());
|
||||
|
||||
long totalInput = dateStrList.stream().filter(statMap::containsKey).map(statMap::get).mapToLong(Lucky24PersonalStat::getTotalInput).sum();
|
||||
long totalOutput = dateStrList.stream().filter(statMap::containsKey).map(statMap::get).mapToLong(Lucky24PersonalStat::getTotalOutput).sum();
|
||||
@@ -543,6 +544,7 @@ public class Lucky24RecordAdminService {
|
||||
BigDecimal productionRatio = totalInput > 0L? (receiverReward.add(BigDecimal.valueOf(totalOutput))).divide(BigDecimal.valueOf(totalInput), 4, RoundingMode.HALF_UP): BigDecimal.ZERO;
|
||||
Lucky24OperatorPersonalStatVo totalVo = new Lucky24OperatorPersonalStatVo("汇总", partitionEnum.getId(), uid, erbanNo, userRechargeLevel, totalInput, totalOutput, receiverReward.longValue(), production, productionRatio);
|
||||
|
||||
List<Lucky24OperatorPersonalStatVo> voList = new ArrayList<>();
|
||||
voList.add(0, totalVo);
|
||||
return voList;
|
||||
}
|
||||
|
Reference in New Issue
Block a user