update 电单车

This commit is contained in:
Guoqs
2024-09-23 11:41:19 +08:00
parent 9f9bb44e74
commit 16630437fb
11 changed files with 72 additions and 14 deletions

View File

@@ -726,8 +726,8 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
if (StringUtils.isBlank(pileConnectorCode)) {
return null;
}
String pileSn = pileConnectorCode.substring(0, pileConnectorCode.length() - 2);
String connectorCode = pileConnectorCode.substring(pileConnectorCode.length() - 2);
String pileSn = YKCUtils.getPileSn(pileConnectorCode);
String connectorCode = YKCUtils.getConnectorCode(pileConnectorCode);
return queryChargingByPileSnAndConnectorCode(pileSn, connectorCode);
}
@@ -4066,5 +4066,10 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
return vo;
}
@Override
public List<OrderBasicInfo> queryOrdersByPileConnectorCodeAndStatus(String pileConnectorCode, String orderStatus, String payStatus) {
return orderBasicInfoMapper.queryOrdersByPileConnectorCodeAndStatus(pileConnectorCode, orderStatus, payStatus);
}
}

View File

@@ -779,7 +779,9 @@ public class PileConnectorInfoServiceImpl implements PileConnectorInfoService {
public Map<String, Integer> getPileTypeNum(Long stationId) {
// 获取充电站枪口列表
List<ConnectorInfoVO> connectorList = getUniAppConnectorList(stationId);
return getPileTypeNum(connectorList);
Map<String, Integer> pileTypeNum = getPileTypeNum(connectorList);
log.info("根据站点id:{}, 查询快、慢充设备数量:{}", stationId, pileTypeNum);
return pileTypeNum;
}
/**

View File

@@ -563,13 +563,13 @@ public class PileStationInfoServiceImpl implements PileStationInfoService {
// 查询快慢充数量
Map<String, Integer> map = pileConnectorInfoService.getPileTypeNum(Long.parseLong(pileStationVO.getId()));
Integer fastFree = map.get("fastFree");
Integer slowFree = map.get("slowFree");
// Integer fastFree = map.get("fastFree");
// Integer slowFree = map.get("slowFree");
stationVO.setFastTotal(map.get("fastTotal"));
stationVO.setFastFree(fastFree);
stationVO.setFastFree(map.get("fastFree"));
stationVO.setSlowTotal(map.get("slowTotal"));
stationVO.setSlowFree(map.get("slowFree"));
stationVO.setTotalFree(fastFree + slowFree);
stationVO.setTotalFree(stationVO.getFastFree() + stationVO.getSlowFree());
// 查询当前时段电费
CurrentTimePriceDetails currentTimePriceDetails = pileBillingTemplateService.getCurrentTimePriceDetails(stationVO.getStationId());