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 96b1ba578..5e9a62a77 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 @@ -374,9 +374,6 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { if (CollectionUtils.isNotEmpty(dto.getStationIdList())) { stationIdList.addAll(dto.getStationIdList()); } - if (StringUtils.isNotBlank(dto.getStationId())) { - stationIdList.add(dto.getStationId()); - } if (StringUtils.isNotBlank(dto.getMerchantId())) { List pileStationInfos = pileStationInfoService.selectStationListByMerchantId(Long.parseLong(dto.getMerchantId())); if (CollectionUtils.isNotEmpty(pileStationInfos)) { @@ -386,6 +383,10 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { stationIdList.addAll(collect); } } + if (StringUtils.isNotBlank(dto.getStationId())) { + stationIdList.clear(); + stationIdList.add(dto.getStationId()); + } OrderTotalDataVO vo = new OrderTotalDataVO(); String startTime = dto.getStartTime() == null ? DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.addDays(new Date(), -7)) : dto.getStartTime(); // 2023-08-16 00:00:00