|
|
@@ -61,6 +61,7 @@ import java.math.BigDecimal;
|
|
|
import java.math.RoundingMode;
|
|
|
import java.text.DecimalFormat;
|
|
|
import java.time.LocalDateTime;
|
|
|
+import java.time.format.DateTimeFormatter;
|
|
|
import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
@@ -1564,6 +1565,17 @@ public class WalletService {
|
|
|
logs.setRemark(a.getContent());
|
|
|
logs.setCreateTime(a.getCreateTime());
|
|
|
return logs;
|
|
|
+ }).sorted((c1, c2) -> {
|
|
|
+ DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
|
|
|
+ if (StringUtils.isBlank(c1.getCreateTime())) {
|
|
|
+ return 0;
|
|
|
+ }
|
|
|
+ if (StringUtils.isBlank(c2.getCreateTime())) {
|
|
|
+ return 1;
|
|
|
+ }
|
|
|
+ LocalDateTime parse = LocalDateTime.parse(c1.getCreateTime(), df);
|
|
|
+ LocalDateTime parse2 = LocalDateTime.parse(c2.getCreateTime(), df);
|
|
|
+ return parse.compareTo(parse2);
|
|
|
}).collect(Collectors.toList());
|
|
|
cashDetailVo.setLogs(collect);
|
|
|
}
|