diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java index f17877892..3a829967d 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java @@ -271,7 +271,7 @@ public interface IOrderBasicInfoService { /** * 生成订单日报 */ - void generateDailyOrderReports(String stationId); + void generateDailyOrderReports(String stationId, String startTime, String endTime); /** * 获取运营商订单列表 diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index 0fd62032c..128396df0 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -2052,7 +2052,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { } @Override - public void generateDailyOrderReports(String stationId) { + public void generateDailyOrderReports(String stationId, String startTime, String endTime) { if (StringUtils.isBlank(stationId)) { return; } @@ -2060,9 +2060,17 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { // 查询站点前一天完成的订单 QueryOrderDTO dto = new QueryOrderDTO(); dto.setStationId(stationId); + LocalDate yesterday = LocalDate.now().plusDays(-1); - dto.setStartTime(DateUtils.formatDateTime(LocalDateTime.of(yesterday, LocalTime.MIN))); - dto.setEndTime(DateUtils.formatDateTime(LocalDateTime.of(yesterday, LocalTime.MAX))); + if (StringUtils.isBlank(startTime)) { + startTime = DateUtils.formatDateTime(LocalDateTime.of(yesterday, LocalTime.MIN)); + } + if (StringUtils.isBlank(endTime)) { + endTime = DateUtils.formatDateTime(LocalDateTime.of(yesterday, LocalTime.MAX)); + } + + dto.setStartTime(startTime); + dto.setEndTime(endTime); List orderListVOS = orderBasicInfoMapper.selectOrderBasicInfoList(dto); if (CollectionUtils.isEmpty(orderListVOS)) { logger.warn("站点:{}, 在{}没有查询到订单数据", stationInfo.getStationName(), yesterday.toString()); diff --git a/jsowell-quartz/src/main/java/com/jsowell/quartz/task/JsowellTask.java b/jsowell-quartz/src/main/java/com/jsowell/quartz/task/JsowellTask.java index 98f167e31..bb763f472 100644 --- a/jsowell-quartz/src/main/java/com/jsowell/quartz/task/JsowellTask.java +++ b/jsowell-quartz/src/main/java/com/jsowell/quartz/task/JsowellTask.java @@ -19,7 +19,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import java.math.BigDecimal; +import java.time.LocalDate; import java.time.LocalDateTime; +import java.time.LocalTime; import java.util.Date; import java.util.List; @@ -115,10 +117,13 @@ public class JsowellTask { if (CollectionUtils.isEmpty(list)) { return; } + LocalDate yesterday = LocalDate.now().plusDays(-1); + String startTime = DateUtils.formatDateTime(LocalDateTime.of(yesterday, LocalTime.MIN)); + String endTime = DateUtils.formatDateTime(LocalDateTime.of(yesterday, LocalTime.MAX)); // 计算每个站点前一天的报表 for (PileStationInfo stationInfo : list) { try { - orderBasicInfoService.generateDailyOrderReports(stationInfo.getId() + ""); + orderBasicInfoService.generateDailyOrderReports(stationInfo.getId() + "", startTime, endTime); } catch (Exception e) { log.error("计算站点订单报表 发生异常 stationId:{}", stationInfo.getId(), e); }