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

手动结算订单

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-03-17 16:03:16 +08:00
parent a81567b9f5
commit dbe6262197
4 changed files with 60 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
View File

@@ -588,6 +588,7 @@ public class OrderService {
}
OrderDetailInfoVO.OrderInfo order = new OrderDetailInfoVO.OrderInfo();
order.setOrderCode(orderBasicInfo.getOrderCode());
order.setTransactionCode(orderBasicInfo.getTransactionCode());
order.setOrderStatus(orderBasicInfo.getOrderStatus());
String describe = orderBasicInfoService.transformOrderStatusDescribe(orderBasicInfo.getOrderStatus(), orderBasicInfo.getPayStatus());
order.setOrderStatusDescribe(describe);
@@ -609,9 +610,9 @@ public class OrderService {
dto.setConnectorCodeList(Lists.newArrayList(pileConnectorCode));
List<RealTimeMonitorData> chargingRealTimeDataList = orderBasicInfoService.getChargingRealTimeData(orderBasicInfo.getTransactionCode());
if (CollectionUtils.isNotEmpty(chargingRealTimeDataList)) {
List<OrderDetailInfoVO.RealTimeMonitorData> infoList = Lists.newArrayList();
List<OrderDetailInfoVO.PileMonitorData> infoList = Lists.newArrayList();
for (RealTimeMonitorData realTimeMonitorData : chargingRealTimeDataList) {
OrderDetailInfoVO.RealTimeMonitorData info = new OrderDetailInfoVO.RealTimeMonitorData();
OrderDetailInfoVO.PileMonitorData info = new OrderDetailInfoVO.PileMonitorData();
info.setInstantCurrent(realTimeMonitorData.getOutputCurrent()); // 电流
info.setInstantVoltage(realTimeMonitorData.getOutputVoltage()); // 电压
info.setInstantPower(realTimeMonitorData.getOutputPower()); // 功率
@@ -634,9 +635,12 @@ public class OrderService {
// 根据时间进行正序排序
infoList = infoList.stream()
.sorted(Comparator.comparing(OrderDetailInfoVO.RealTimeMonitorData::getTime))
.sorted(Comparator.comparing(OrderDetailInfoVO.PileMonitorData::getTime))
.collect(Collectors.toList());
vo.setRealTimeMonitorDataList(infoList);
// 最后一次实时数据
vo.setLastMonitorData(chargingRealTimeDataList.get(0));
}
// 支付流水
@@ -809,6 +813,7 @@ public class OrderService {
* @param dto
*/
public boolean manualSettlementOrder(QueryOrderDTO dto) {
log.info("人工结算订单-begin orderCode:{}", dto.getOrderCode());
// 查询订单
OrderBasicInfo orderBasicInfo = orderBasicInfoService.getOrderInfoByOrderCode(dto.getOrderCode());
if (orderBasicInfo == null) {
@@ -847,6 +852,8 @@ public class OrderService {
// 发送停止充电指令
pileRemoteService.remoteStopCharging(orderBasicInfo.getPileSn(), orderBasicInfo.getConnectorCode());
log.info("人工结算订单-end orderCode:{}", dto.getOrderCode());
return true;
}
}