From 3dcc0e2fa59de03031058470e4c54e612157c487 Mon Sep 17 00:00:00 2001 From: Lemon Date: Wed, 27 Sep 2023 10:08:12 +0800 Subject: [PATCH] =?UTF-8?q?bugfix=20=20=E6=9F=A5=E8=AF=A2=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8=E7=A1=AE=E5=AE=9A=E7=AB=99=E7=82=B9?= =?UTF-8?q?id=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pile/service/impl/OrderBasicInfoServiceImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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