|
@@ -3653,10 +3653,10 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
|
|
|
TopOrderStatisticsTwoVo twoVo = new TopOrderStatisticsTwoVo();
|
|
|
twoVo.setTime(time);
|
|
|
twoVo.setTimeStr(DateUtils.timestampToDateFormat(time,"yyyy-MM"));
|
|
|
- if (voList2.stream().anyMatch(x ->
|
|
|
+ if (voList3.stream().anyMatch(x ->
|
|
|
DateUtils.getScheduleTimeZeroTime(x.getOrderTime()) >= time
|
|
|
&& DateUtils.getScheduleTimeZeroTime(x.getOrderTime()) <= monthTime.get(time))){
|
|
|
- TopOrderStatisticsTwoVo statisticsTwoVo = voList2.stream()
|
|
|
+ TopOrderStatisticsTwoVo statisticsTwoVo = voList3.stream()
|
|
|
.filter(x ->
|
|
|
DateUtils.getScheduleTimeZeroTime(x.getOrderTime()) >= time
|
|
|
&& DateUtils.getScheduleTimeZeroTime(x.getOrderTime()) <= monthTime.get(time)).findFirst().get();
|
|
@@ -3758,10 +3758,10 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
|
|
|
TopOrderStatisticsTwoVo twoVo = new TopOrderStatisticsTwoVo();
|
|
|
twoVo.setTime(time);
|
|
|
twoVo.setTimeStr(DateUtils.timestampToDateFormat(time,"yyyy-MM"));
|
|
|
- if (voList2.stream().anyMatch(x ->
|
|
|
+ if (voList3.stream().anyMatch(x ->
|
|
|
DateUtils.getScheduleTimeZeroTime(x.getOrderTime()) >= time
|
|
|
&& DateUtils.getScheduleTimeZeroTime(x.getOrderTime()) <= monthTime.get(time))){
|
|
|
- TopOrderStatisticsTwoVo statisticsTwoVo = voList2.stream()
|
|
|
+ TopOrderStatisticsTwoVo statisticsTwoVo = voList3.stream()
|
|
|
.filter(x ->
|
|
|
DateUtils.getScheduleTimeZeroTime(x.getOrderTime()) >= time
|
|
|
&& DateUtils.getScheduleTimeZeroTime(x.getOrderTime()) <= monthTime.get(time)).findFirst().get();
|