From 1bc5e9fa6a5a6d16c226beb1617f0f5f1b1bcdd2 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Tue, 30 Jan 2024 13:52:20 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E8=AE=A1=E7=AE=97=E7=AB=99=E7=82=B9?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=8A=A5=E8=A1=A8=EF=BC=8C=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E5=8F=AA=E6=9F=A5=E5=AF=B9?= =?UTF-8?q?=E5=BA=94=E5=BD=93=E5=89=8D=E8=BF=90=E8=90=A5=E5=95=86=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsowell/pile/service/impl/SettleOrderReportServiceImpl.java | 2 ++ .../thirdparty/zhongdianlian/service/impl/ZDLServiceImpl.java | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java index c9072b601..b95cd4fd0 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java @@ -579,6 +579,8 @@ public class SettleOrderReportServiceImpl implements SettleOrderReportService { String endTime = DateUtils.formatDateTime(LocalDateTime.of(parse, LocalTime.MAX)); dto.setStartSettleTime(startTime); dto.setEndSettleTime(endTime); + // 2024年1月30日13点49分 查询订单列表只查对应当前运营商的 + dto.setMerchantId(stationInfo.getMerchantId()); // 查询结算完成的订单 List orderListVOS = orderBasicInfoMapper.selectOrderBasicInfoList(dto); // if (CollectionUtils.isEmpty(orderListVOS)) { diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/service/impl/ZDLServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/service/impl/ZDLServiceImpl.java index 7a2dc218f..cdb25f4b7 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/service/impl/ZDLServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/service/impl/ZDLServiceImpl.java @@ -230,7 +230,6 @@ public class ZDLServiceImpl implements ZDLService { .stationLng(new BigDecimal(pileStationInfo.getStationLng())) .stationLat(new BigDecimal(pileStationInfo.getStationLat())) .construction(Integer.valueOf(pileStationInfo.getConstruction())) - .build(); // 截取运营商组织机构代码(去除最后一位后的最后九位) MerchantInfoVO merchantInfo = pileMerchantInfoService.getMerchantInfoVO(String.valueOf(pileStationInfo.getMerchantId()));