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()));