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

手动结算订单支持自定义输入金额和充电度数

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-03-18 16:57:08 +08:00
parent 7966386ee2
commit 15bae72411
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -836,7 +836,7 @@ public class OrderService {
String chargingAmount = dto.getChargingAmount(); String chargingAmount = dto.getChargingAmount();
String chargingDegree = dto.getChargingDegree(); String chargingDegree = dto.getChargingDegree();
if (StringUtils.isBlank(chargingAmount) || StringUtils.isBlank(chargingDegree)) { if (StringUtils.equals(chargingAmount, Constants.ZERO) || StringUtils.equals(chargingDegree, Constants.ZERO)) {
// 获取最后一次实时数据 // 获取最后一次实时数据
List<RealTimeMonitorData> chargingRealTimeData = orderBasicInfoService.getChargingRealTimeData(orderBasicInfo.getTransactionCode()); List<RealTimeMonitorData> chargingRealTimeData = orderBasicInfoService.getChargingRealTimeData(orderBasicInfo.getTransactionCode());
if (CollectionUtils.isNotEmpty(chargingRealTimeData)) { if (CollectionUtils.isNotEmpty(chargingRealTimeData)) {

6
jsowell-ui/src/views/order/order/orderDetail.vue
View File

@@ -234,6 +234,12 @@ export default {
this.dialogVisible = true; this.dialogVisible = true;
}, },
confirmManualSettlement() { confirmManualSettlement() {
if (this.manualSettlementParam.chargingAmount == null) {
return false;
}
if (this.manualSettlementParam.chargingDegree == null) {
return false;
}
this.manualSettlementParam.orderCode = this.orderInfo[0].orderCode; this.manualSettlementParam.orderCode = this.orderInfo[0].orderCode;
console.log("确认手动结算订单param:", this.manualSettlementParam); console.log("确认手动结算订单param:", this.manualSettlementParam);
manualSettlementOrder(this.manualSettlementParam).then(response => { manualSettlementOrder(this.manualSettlementParam).then(response => {