diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java index 622f45369..b9789c4d8 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java @@ -113,7 +113,7 @@ public interface OrderBasicInfoService{ OrderBasicInfo saveOrderForEBike(GenerateOrderDTO dto) throws ParseException; - List selectOrderListByDateTime(LocalDateTime start, LocalDateTime end); + List selectOrderListByDateTime(LocalDateTime start, LocalDateTime end, String stationId); /** * 修改订单 @@ -633,7 +633,8 @@ public interface OrderBasicInfoService{ void checkOrUpdateOrderSplitRecord(AfterSettleOrderDTO afterSettleOrderDTO); - int updateOrderReviewFlagTemp(List codes); + + int updateOrderReviewFlagTemp(LocalDateTime start, LocalDateTime end, String stationId); List queryOrderSplitConfigList(String orderCode); 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 2976c3f17..952f80e92 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 @@ -990,13 +990,24 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { return orderBasicInfoMapper.selectOrderBasicInfoList(dto); } + /** + * 根据时间查询订单列表 + * @param start 时间开始 + * @param end 时间结束 + * @param stationId 站点ID + * @return + */ @Override - public List selectOrderListByDateTime(LocalDateTime start, LocalDateTime end) { + public List selectOrderListByDateTime(LocalDateTime start, LocalDateTime end, String stationId) { + // 校验入参 + if (start == null || end == null || stationId == null) { + return null; + } QueryOrderDTO dto = QueryOrderDTO.builder() .startTime(DateUtils.formatDateTime(start)) .endTime(DateUtils.formatDateTime(end)) .payMode(OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue()) - .stationId("1003") // 目前只有 大坡中学举视超充站 这一个站点使用 + .stationId(stationId) .orderStatus(OrderStatusEnum.ORDER_COMPLETE.getValue()) .build(); return orderBasicInfoMapper.selectOrderBasicInfoList(dto); @@ -6255,16 +6266,19 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { } } - /** - * 批量修改订单审核状态 - * @param dto - * @return - */ @Override - public int updateOrderReviewFlagTemp(List codes) { - List l = MerchantUtils.getRandomNinetyPercent(codes); + public int updateOrderReviewFlagTemp(LocalDateTime start, LocalDateTime end, String stationId) { + if (StringUtils.isBlank(stationId)) { + stationId = "1003"; // 目前只有 大坡中学举视超充站 这一个站点使用 + } + List orderList = this.selectOrderListByDateTime(start, end, stationId); + if (CollectionUtils.isEmpty(orderList)) { + return 0; + } + List orderCodeList = orderList.stream().map(OrderListVO::getOrderCode).collect(Collectors.toList()); UpdateOrderReviewDTO dto = new UpdateOrderReviewDTO(); - dto.setOrderCodeList(l); + dto.setOrderCodeList(MerchantUtils.getRandomNinetyPercent(orderCodeList)); + dto.setStationId(stationId); return batchUpdateOrderReview(dto); } 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 ca8ccee83..967c56cab 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 @@ -24,7 +24,6 @@ import com.jsowell.pile.domain.ykcCommond.StartChargingCommand; import com.jsowell.pile.service.*; import com.jsowell.pile.vo.base.StationInfoVO; import com.jsowell.pile.vo.web.BillingTemplateVO; -import com.jsowell.pile.vo.web.OrderListVO; import com.jsowell.thirdparty.amap.service.AMapService; import com.jsowell.thirdparty.common.NotificationDTO; import com.jsowell.thirdparty.common.NotificationService; @@ -492,12 +491,8 @@ public class JsowellTask { LocalDate yesterday = DateUtils.getYesterday(); LocalDateTime start = yesterday.atStartOfDay(); LocalDateTime end = yesterday.atTime(23, 59, 59); - List orderList = orderBasicInfoService.selectOrderListByDateTime(start, end); - if (CollectionUtils.isEmpty(orderList)) { - return; - } - List list = orderList.stream().map(OrderListVO::getOrderCode).collect(Collectors.toList()); - orderBasicInfoService.updateOrderReviewFlagTemp(list); + + orderBasicInfoService.updateOrderReviewFlagTemp(start, end, null); }