autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-07-04 05:58:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复 联联推送订单bug

Browse Source
This commit is contained in:
Lemon
2023-09-13 15:23:01 +08:00
parent 6dc6e8ab05
commit 318f7a35ac
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
jsowell-admin/src/main/java/com/jsowell/service/PileService.java
View File

@@ -191,11 +191,11 @@ public class PileService {
} }
// 判断桩是否在线 // 判断桩是否在线
boolean onLineStatus = pileConnectorInfoService.checkPileOffLine(pileInfoVO.getPileSn()); // boolean onLineStatus = pileConnectorInfoService.checkPileOffLine(pileInfoVO.getPileSn());
if (!onLineStatus) { // if (!onLineStatus) {
// 离线 // // 离线
throw new BusinessException(ReturnCodeEnum.CODE_PILE_CONNECTOR_STATUS_ERROR); // throw new BusinessException(ReturnCodeEnum.CODE_PILE_CONNECTOR_STATUS_ERROR);
} // }
// 查询站点信息 // 查询站点信息
PileStationVO stationInfo = pileStationInfoService.getStationInfo(pileInfoVO.getStationId()); PileStationVO stationInfo = pileStationInfoService.getStationInfo(pileInfoVO.getStationId());

10
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java vendored
View File

@@ -875,7 +875,7 @@ public class LianLianServiceImpl implements LianLianService {
OrderInfo orderInfo = OrderInfo.builder() OrderInfo orderInfo = OrderInfo.builder()
.operatorID(operatorId) .operatorID(operatorId)
.equipmentOwnerID(Constants.OPERATORID_LIANLIAN) .equipmentOwnerID(Constants.OPERATORID_LIANLIAN)
.stationID(orderBasicInfo.getStationId()) .stationID("LC" + orderBasicInfo.getStationId())
.equipmentID(orderBasicInfo.getPileSn()) .equipmentID(orderBasicInfo.getPileSn())
.connectorID(orderBasicInfo.getPileConnectorCode()) .connectorID(orderBasicInfo.getPileConnectorCode())
.startChargeSeq(orderCode) .startChargeSeq(orderCode)
@@ -1361,18 +1361,18 @@ public class LianLianServiceImpl implements LianLianService {
// 通过订单号查询信息 // 通过订单号查询信息
OrderBasicInfo orderInfo = orderBasicInfoService.getOrderInfoByOrderCode(orderCode); OrderBasicInfo orderInfo = orderBasicInfoService.getOrderInfoByOrderCode(orderCode);
// 根据枪口号查询充电实时状态 // 根据枪口号查询充电实时状态
OrderBasicInfo orderBasicInfo = orderBasicInfoService.queryChargingByPileConnectorCode(orderInfo.getPileConnectorCode()); // OrderBasicInfo orderBasicInfo = orderBasicInfoService.queryChargingByPileConnectorCode(orderInfo.getPileConnectorCode());
List<RealTimeMonitorData> list = orderBasicInfoService.getChargingRealTimeData(orderBasicInfo.getTransactionCode()); List<RealTimeMonitorData> list = orderBasicInfoService.getChargingRealTimeData(orderInfo.getTransactionCode());
RealTimeMonitorData realTimeMonitorData = list.get(0); RealTimeMonitorData realTimeMonitorData = list.get(0);
// 拼装联联参数 // 拼装联联参数
ConnectorChargeStatusInfo info = ConnectorChargeStatusInfo.builder() ConnectorChargeStatusInfo info = ConnectorChargeStatusInfo.builder()
.startChargeSeq(orderBasicInfo.getOrderCode()) .startChargeSeq(orderCode)
.connectorID(orderInfo.getPileConnectorCode()) .connectorID(orderInfo.getPileConnectorCode())
.connectorStatus(Integer.valueOf(realTimeMonitorData.getConnectorStatus())) .connectorStatus(Integer.valueOf(realTimeMonitorData.getConnectorStatus()))
.currentA(new BigDecimal(realTimeMonitorData.getOutputCurrent())) .currentA(new BigDecimal(realTimeMonitorData.getOutputCurrent()))
.voltageA(new BigDecimal(realTimeMonitorData.getOutputVoltage())) .voltageA(new BigDecimal(realTimeMonitorData.getOutputVoltage()))
.soc(new BigDecimal(realTimeMonitorData.getSOC())) .soc(new BigDecimal(realTimeMonitorData.getSOC()))
.startTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, orderBasicInfo.getChargeStartTime())) .startTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, orderInfo.getChargeStartTime()))
.endTime(DateUtils.getTime()) .endTime(DateUtils.getTime())
.totalPower(new BigDecimal(realTimeMonitorData.getChargingDegree())) .totalPower(new BigDecimal(realTimeMonitorData.getChargingDegree()))
.elecMoney(new BigDecimal("0")) // TODO .elecMoney(new BigDecimal("0")) // TODO