dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新10.16

Browse Source
This commit is contained in:
许允枞 2024-10-16 16:05:03 +08:00
parent cf5d8d46f7
commit 75cbf0af25
2 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fuintAdmin/src/views/shopowner.vue
View File

@ -906,6 +906,10 @@ export default {
data: times,
axisPointer: {
type: 'shadow'
},
axisLabel: {
interval: 0,
// rotate: 30
}
}
],
@ -955,6 +959,10 @@ export default {
data: showTimes,
axisPointer: {
type: 'shadow'
},
axisLabel: {
interval: 0,
// rotate: 30
}
}
],

31
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java
View File

@ -1883,6 +1883,9 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper, All
} else if (DateUtil.between(DateUtil.parse(startTime), DateUtil.parse(endTime), DateUnit.DAY) <= 1) {
days = getAllDatesBetweenDay(DateUtil.beginOfDay(DateUtil.parse(startTime)).toString(), DateUtil.endOfDay(DateUtil.parse(endTime)).toString());
type = 2;
} else if (DateUtil.between(DateUtil.parse(startTime), DateUtil.parse(endTime), DateUnit.DAY) >= 30) {
days = getAllDatesBetweenMonth(DateUtil.beginOfDay(DateUtil.parse(startTime)).toString(), DateUtil.endOfDay(DateUtil.parse(endTime)).toString());
type = 3;
}
//根据开始时间与结束时间获取所有天数
//查询所有订单
@ -1907,6 +1910,11 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper, All
mapData.put("day", parse.toString("MM-dd HH:mm"));
dateTime = DateUtil.beginOfHour(DateUtil.parse(day));
dateTime1 = DateUtil.endOfHour(dateTime);
}else if (type == 3) {
DateTime parse = DateUtil.parse(day);
mapData.put("day", parse.toString("yyyy-MM-dd"));
dateTime = DateUtil.beginOfDay(parse);
dateTime1 = DateUtil.endOfDay(DateUtil.offsetDay(dateTime, 3));
} else {
mapData.put("day", day);
dateTime = DateUtil.beginOfDay(DateUtil.parse(day));
@ -1974,6 +1982,21 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper, All
}
return dateList;
}
public List<String> getAllDatesBetweenMonth(String startTime, String endTime) {
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
LocalDateTime startDate = LocalDateTime.parse(startTime, formatter);
LocalDateTime endDate = LocalDateTime.parse(endTime, formatter);
List<String> dateList = new ArrayList<>();
while (!startDate.isAfter(endDate)) {
dateList.add(startDate.format(formatter));
startDate = startDate.plusDays(3);
}
return dateList;
}
@ -2113,6 +2136,9 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper, All
} else if (DateUtil.between(DateUtil.parse(startTime), DateUtil.parse(endTime), DateUnit.DAY) <= 1) {
allDatesBetween = getAllDatesBetweenDay(DateUtil.beginOfDay(DateUtil.parse(startTime)).toString(), DateUtil.endOfDay(DateUtil.parse(endTime)).toString());
type = 2;
} else if (DateUtil.between(DateUtil.parse(startTime), DateUtil.parse(endTime), DateUnit.DAY) >= 30) {
allDatesBetween = getAllDatesBetweenMonth(DateUtil.beginOfDay(DateUtil.parse(startTime)).toString(), DateUtil.endOfDay(DateUtil.parse(endTime)).toString());
type = 3;
}
List<String> oilNames = new ArrayList<>();
@ -2138,6 +2164,11 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper, All
params.put("time", parse.toString("MM-dd HH:mm"));
dateTime = DateUtil.beginOfHour(parse);
dateTime1 = DateUtil.endOfHour(dateTime);
} else if (type == 3) {
DateTime parse = DateUtil.parse(time);
params.put("time", parse.toString("yyyy-MM-dd"));
dateTime = DateUtil.beginOfDay(parse);
dateTime1 = DateUtil.endOfDay(DateUtil.offsetDay(dateTime, 3));
} else {
params.put("time", time);
dateTime = DateUtil.beginOfDay(DateUtil.parse(time));