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

update 计算站点订单报表，查询订单列表只查对应当前运营商的

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2024-01-30 13:52:20 +08:00
parent 9e9c84b194
commit 1bc5e9fa6a
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java
View File

@@ -579,6 +579,8 @@ public class SettleOrderReportServiceImpl implements SettleOrderReportService {
String endTime = DateUtils.formatDateTime(LocalDateTime.of(parse, LocalTime.MAX)); String endTime = DateUtils.formatDateTime(LocalDateTime.of(parse, LocalTime.MAX));
dto.setStartSettleTime(startTime); dto.setStartSettleTime(startTime);
dto.setEndSettleTime(endTime); dto.setEndSettleTime(endTime);
// 2024年1月30日13点49分 查询订单列表只查对应当前运营商的
dto.setMerchantId(stationInfo.getMerchantId());
// 查询结算完成的订单 // 查询结算完成的订单
List<OrderListVO> orderListVOS = orderBasicInfoMapper.selectOrderBasicInfoList(dto); List<OrderListVO> orderListVOS = orderBasicInfoMapper.selectOrderBasicInfoList(dto);
// if (CollectionUtils.isEmpty(orderListVOS)) { // if (CollectionUtils.isEmpty(orderListVOS)) {

1
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/service/impl/ZDLServiceImpl.java vendored
View File

@@ -230,7 +230,6 @@ public class ZDLServiceImpl implements ZDLService {
.stationLng(new BigDecimal(pileStationInfo.getStationLng())) .stationLng(new BigDecimal(pileStationInfo.getStationLng()))
.stationLat(new BigDecimal(pileStationInfo.getStationLat())) .stationLat(new BigDecimal(pileStationInfo.getStationLat()))
.construction(Integer.valueOf(pileStationInfo.getConstruction())) .construction(Integer.valueOf(pileStationInfo.getConstruction()))
.build(); .build();
// 截取运营商组织机构代码(去除最后一位后的最后九位) // 截取运营商组织机构代码(去除最后一位后的最后九位)
MerchantInfoVO merchantInfo = pileMerchantInfoService.getMerchantInfoVO(String.valueOf(pileStationInfo.getMerchantId())); MerchantInfoVO merchantInfo = pileMerchantInfoService.getMerchantInfoVO(String.valueOf(pileStationInfo.getMerchantId()));