diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index fd23bf27e..e67b01f71 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -197,6 +197,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { /** * 通过订单状态和支付状态 转换订单状态描述 + * * @param orderStatus * @param payStatus * @return @@ -620,7 +621,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { orderDetail.setSharpAmount(new BigDecimal(data.getSharpAmount())); } // 计算该时段电费 - BigDecimal multiply = orderDetail.getSharpElectricityPrice().multiply(new BigDecimal(sharpUsedElectricity)).setScale(2,BigDecimal.ROUND_DOWN); + BigDecimal multiply = orderDetail.getSharpElectricityPrice().multiply(new BigDecimal(sharpUsedElectricity)).setScale(2, BigDecimal.ROUND_DOWN); totalElectricityAmount = totalElectricityAmount.add(multiply); } @@ -635,7 +636,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { orderDetail.setPeakAmount(new BigDecimal(data.getPeakAmount())); } // 计算该时段电费 - BigDecimal multiply = orderDetail.getPeakElectricityPrice().multiply(new BigDecimal(peakUsedElectricity)).setScale(2,BigDecimal.ROUND_DOWN); + BigDecimal multiply = orderDetail.getPeakElectricityPrice().multiply(new BigDecimal(peakUsedElectricity)).setScale(2, BigDecimal.ROUND_DOWN); totalElectricityAmount = totalElectricityAmount.add(multiply); } @@ -650,7 +651,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { orderDetail.setFlatAmount(new BigDecimal(data.getFlatAmount())); } // 计算该时段电费 - BigDecimal multiply = orderDetail.getFlatElectricityPrice().multiply(new BigDecimal(flatUsedElectricity)).setScale(2,BigDecimal.ROUND_DOWN); + BigDecimal multiply = orderDetail.getFlatElectricityPrice().multiply(new BigDecimal(flatUsedElectricity)).setScale(2, BigDecimal.ROUND_DOWN); totalElectricityAmount = totalElectricityAmount.add(multiply); } @@ -665,7 +666,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { orderDetail.setValleyAmount(new BigDecimal(data.getValleyAmount())); } // 计算该时段电费 - BigDecimal multiply = orderDetail.getValleyElectricityPrice().multiply(new BigDecimal(valleyUsedElectricity)).setScale(2,BigDecimal.ROUND_DOWN); + BigDecimal multiply = orderDetail.getValleyElectricityPrice().multiply(new BigDecimal(valleyUsedElectricity)).setScale(2, BigDecimal.ROUND_DOWN); totalElectricityAmount = totalElectricityAmount.add(multiply); } @@ -708,6 +709,24 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { if (CollectionUtils.isEmpty(chargingRealTimeData)) { return; } + List list = Lists.newArrayList(); + for (RealTimeMonitorData data : chargingRealTimeData) { + RealTimeMonitorData build = RealTimeMonitorData.builder() + .outputCurrent(data.getOutputCurrent()) + .outputCurrent(data.getOutputCurrent()) // 电流 + .outputVoltage(data.getOutputVoltage()) // 电压 + .outputPower(data.getOutputPower()) // 功率 + .SOC(data.getSOC()) // soc + .dateTime(data.getDateTime()) // 时间 + .batteryMaxTemperature(data.getBatteryMaxTemperature()) + .chargingAmount(data.getChargingAmount()) + .chargingDegree(data.getChargingDegree()) + .sumChargingTime(data.getSumChargingTime()) + .timeRemaining(data.getTimeRemaining()) + .gunLineTemperature(data.getGunLineTemperature()) + .build(); + list.add(build); + } // 删除redis中缓存 @@ -756,7 +775,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { BigDecimal sharpUsedElectricity = orderDetail.getSharpUsedElectricity(); if (sharpUsedElectricity != null) { // 计算该时段电费 - BigDecimal multiply = orderDetail.getSharpElectricityPrice().multiply(sharpUsedElectricity).setScale(2,BigDecimal.ROUND_DOWN); + BigDecimal multiply = orderDetail.getSharpElectricityPrice().multiply(sharpUsedElectricity).setScale(2, BigDecimal.ROUND_DOWN); totalElectricityAmount = totalElectricityAmount.add(multiply); } @@ -764,7 +783,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { BigDecimal peakUsedElectricity = orderDetail.getPeakUsedElectricity(); if (peakUsedElectricity != null) { // 计算该时段电费 - BigDecimal multiply = orderDetail.getPeakElectricityPrice().multiply(peakUsedElectricity).setScale(2,BigDecimal.ROUND_DOWN); + BigDecimal multiply = orderDetail.getPeakElectricityPrice().multiply(peakUsedElectricity).setScale(2, BigDecimal.ROUND_DOWN); totalElectricityAmount = totalElectricityAmount.add(multiply); } @@ -772,7 +791,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { BigDecimal flatUsedElectricity = orderDetail.getFlatUsedElectricity(); if (flatUsedElectricity != null) { // 计算该时段电费 - BigDecimal multiply = orderDetail.getFlatElectricityPrice().multiply(flatUsedElectricity).setScale(2,BigDecimal.ROUND_DOWN); + BigDecimal multiply = orderDetail.getFlatElectricityPrice().multiply(flatUsedElectricity).setScale(2, BigDecimal.ROUND_DOWN); totalElectricityAmount = totalElectricityAmount.add(multiply); } @@ -780,13 +799,13 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { BigDecimal valleyUsedElectricity = orderDetail.getValleyUsedElectricity(); if (valleyUsedElectricity != null) { // 计算该时段电费 - BigDecimal multiply = orderDetail.getValleyElectricityPrice().multiply(valleyUsedElectricity).setScale(2,BigDecimal.ROUND_DOWN); + BigDecimal multiply = orderDetail.getValleyElectricityPrice().multiply(valleyUsedElectricity).setScale(2, BigDecimal.ROUND_DOWN); totalElectricityAmount = totalElectricityAmount.add(multiply); } orderDetail.setTotalElectricityAmount(totalElectricityAmount); orderDetail.setTotalServiceAmount(orderDetail.getTotalOrderAmount().subtract(totalElectricityAmount)); - }catch (Exception e) { + } catch (Exception e) { logger.info("发生异常", e); } } @@ -904,7 +923,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { orderBasicInfo.setLogicCard(data.getLogicCard()); // 订单状态 (2023.4.6 要求改成“订单完成”) orderBasicInfo.setOrderStatus(OrderStatusEnum.ORDER_COMPLETE.getValue()); - }else { + } else { // 订单状态 可疑 orderBasicInfo.setOrderStatus(OrderStatusEnum.SUSPICIOUS.getValue()); } @@ -1342,6 +1361,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { /** * 生成订单 返回交易流水号 + * * @param dto * @return */ @@ -1426,22 +1446,24 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { /** * 联联平台 获取累计数据用 + * * @param dto * @return */ - @Override - public List getAccumulativeInfoForLianLian(QueryStationInfoDTO dto) { - return orderBasicInfoMapper.getAccumulativeInfoForLianLian(dto); - } + @Override + public List getAccumulativeInfoForLianLian(QueryStationInfoDTO dto) { + return orderBasicInfoMapper.getAccumulativeInfoForLianLian(dto); + } /** * 联联平台生成订单 + * * @param dto * @return */ @Override public Map generateOrderForLianLian(QueryStartChargeDTO dto) { - // 联联平台生成订单 + // 联联平台生成订单 String orderCode = dto.getStartChargeSeq(); String pileConnectorCode = dto.getConnectorID(); String pileSn = StringUtils.substring(pileConnectorCode, 0, 14);