autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-06-20 15:19:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

bugfix 查询订单列表确定站点id查询条件

Browse Source
This commit is contained in:
Lemon
2023-09-27 10:08:12 +08:00
parent d9e5b2ed36
commit 3dcc0e2fa5
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

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