|
@@ -48,11 +48,9 @@ import org.springframework.data.redis.core.StringRedisTemplate;
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
|
-import java.time.DayOfWeek;
|
|
|
|
|
import java.time.LocalDate;
|
|
import java.time.LocalDate;
|
|
|
import java.time.LocalDateTime;
|
|
import java.time.LocalDateTime;
|
|
|
import java.time.LocalTime;
|
|
import java.time.LocalTime;
|
|
|
-import java.time.temporal.TemporalAdjusters;
|
|
|
|
|
import java.util.*;
|
|
import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
|
import java.util.stream.Stream;
|
|
import java.util.stream.Stream;
|
|
@@ -363,8 +361,8 @@ public class TradeOrderQueryServiceImpl implements TradeOrderQueryService {
|
|
|
LocalDate today = LocalDate.now(); // 获取今天的日期
|
|
LocalDate today = LocalDate.now(); // 获取今天的日期
|
|
|
|
|
|
|
|
if (startTime == null && endTime == null) {
|
|
if (startTime == null && endTime == null) {
|
|
|
- startTime = today.with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY)); // 获取本周的开始日期
|
|
|
|
|
- endTime = today.with(TemporalAdjusters.nextOrSame(DayOfWeek.SUNDAY)); // 获取本周的结束日期
|
|
|
|
|
|
|
+ startTime = today.minusDays(6); // 获取今天的前七天
|
|
|
|
|
+ endTime = today; // 获取今天
|
|
|
}
|
|
}
|
|
|
List<LocalDate> weekDates = generateWeekDates(startTime, endTime); // 生成本周的日期数组
|
|
List<LocalDate> weekDates = generateWeekDates(startTime, endTime); // 生成本周的日期数组
|
|
|
List<EChartsResult.Series> series = weekDates.stream().map(ignored -> new EChartsResult.Series().setCount(0).setMoney(0L)).collect(Collectors.toList());
|
|
List<EChartsResult.Series> series = weekDates.stream().map(ignored -> new EChartsResult.Series().setCount(0).setMoney(0L)).collect(Collectors.toList());
|
Yangzw