|
|
|
@ -515,7 +515,7 @@ public class TradeLogServiceImpl implements TradeLogService {
|
|
|
|
|
.reduce(BigDecimal::add).orElse(BigDecimal.ZERO));
|
|
|
|
|
analysis.put("total_surcharge", logs.parallelStream()
|
|
|
|
|
.filter(log -> log.getBigDecimal("settle_amount") != null)
|
|
|
|
|
.map(log -> getSymbol(log).multiply(log.getBigDecimal("total_surcharge")))
|
|
|
|
|
.map(log -> getSymbol(log).multiply(log.getBigDecimal("total_surcharge").add(log.getBigDecimal("tax_amount"))))
|
|
|
|
|
.reduce(BigDecimal::add).orElse(BigDecimal.ZERO));
|
|
|
|
|
analysis.put("wechat_fee", logs.parallelStream()
|
|
|
|
|
.filter(log -> log.getBigDecimal("settle_amount") != null)
|
|
|
|
|