|
@ -241,25 +241,25 @@ public class StatisticsServiceImpl implements StatisticsService { |
|
|
.filter(record -> record.getType() == 1) // 类型为消费 |
|
|
.filter(record -> record.getType() == 1) // 类型为消费 |
|
|
.mapToInt(UserGoldRecord::getPermanentGold) |
|
|
.mapToInt(UserGoldRecord::getPermanentGold) |
|
|
.sum(); |
|
|
.sum(); |
|
|
statistics.setConsumePermanent(consumePermanent); |
|
|
|
|
|
|
|
|
statistics.setConsumePermanent(Math.abs(consumePermanent)); |
|
|
//消费相关-当日新增消费(六月免费) |
|
|
//消费相关-当日新增消费(六月免费) |
|
|
Integer consumeFreeJune = records.stream() |
|
|
Integer consumeFreeJune = records.stream() |
|
|
.filter(record -> record.getType() == 1) // 类型为消费 |
|
|
.filter(record -> record.getType() == 1) // 类型为消费 |
|
|
.mapToInt(UserGoldRecord::getFreeJune) |
|
|
.mapToInt(UserGoldRecord::getFreeJune) |
|
|
.sum(); |
|
|
.sum(); |
|
|
statistics.setConsumeFreeJune(consumeFreeJune); |
|
|
|
|
|
|
|
|
statistics.setConsumeFreeJune(Math.abs(consumeFreeJune)); |
|
|
//消费相关-当日新增消费(十二月免费) |
|
|
//消费相关-当日新增消费(十二月免费) |
|
|
Integer consumeFreeDecember = records.stream() |
|
|
Integer consumeFreeDecember = records.stream() |
|
|
.filter(record -> record.getType() == 1) // 类型为消费 |
|
|
.filter(record -> record.getType() == 1) // 类型为消费 |
|
|
.mapToInt(UserGoldRecord::getFreeDecember) |
|
|
.mapToInt(UserGoldRecord::getFreeDecember) |
|
|
.sum(); |
|
|
.sum(); |
|
|
statistics.setConsumeFreeDecember(consumeFreeDecember); |
|
|
|
|
|
|
|
|
statistics.setConsumeFreeDecember(Math.abs(consumeFreeDecember)); |
|
|
//消费相关-当日新增消费(任务) |
|
|
//消费相关-当日新增消费(任务) |
|
|
Integer consumeTask = records.stream() |
|
|
Integer consumeTask = records.stream() |
|
|
.filter(record -> record.getType() == 1) // 类型为消费 |
|
|
.filter(record -> record.getType() == 1) // 类型为消费 |
|
|
.mapToInt(UserGoldRecord::getTaskGold) |
|
|
.mapToInt(UserGoldRecord::getTaskGold) |
|
|
.sum(); |
|
|
.sum(); |
|
|
statistics.setConsumeTask(consumeTask); |
|
|
|
|
|
|
|
|
statistics.setConsumeTask(Math.abs(consumeTask)); // 使用 Math.abs 确保为正数 |
|
|
//退款相关-当日退款(永久) |
|
|
//退款相关-当日退款(永久) |
|
|
Integer refundPermanent = records.stream() |
|
|
Integer refundPermanent = records.stream() |
|
|
.filter(record -> record.getType() == 2) // 类型为退款 |
|
|
.filter(record -> record.getType() == 2) // 类型为退款 |
|
|