From 15bae72411c59ff32d86a8693c4af08836e4b67a Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Sat, 18 Mar 2023 16:57:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E7=BB=93=E7=AE=97=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=94=AF=E6=8C=81=E8=87=AA=E5=AE=9A=E4=B9=89=E8=BE=93?= =?UTF-8?q?=E5=85=A5=E9=87=91=E9=A2=9D=E5=92=8C=E5=85=85=E7=94=B5=E5=BA=A6?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jsowell/service/OrderService.java | 2 +- jsowell-ui/src/views/order/order/orderDetail.vue | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java index f3bac5184..5f2d8c542 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -836,7 +836,7 @@ public class OrderService { String chargingAmount = dto.getChargingAmount(); String chargingDegree = dto.getChargingDegree(); - if (StringUtils.isBlank(chargingAmount) || StringUtils.isBlank(chargingDegree)) { + if (StringUtils.equals(chargingAmount, Constants.ZERO) || StringUtils.equals(chargingDegree, Constants.ZERO)) { // 获取最后一次实时数据 List chargingRealTimeData = orderBasicInfoService.getChargingRealTimeData(orderBasicInfo.getTransactionCode()); if (CollectionUtils.isNotEmpty(chargingRealTimeData)) { diff --git a/jsowell-ui/src/views/order/order/orderDetail.vue b/jsowell-ui/src/views/order/order/orderDetail.vue index 79f244c2b..30c22265f 100644 --- a/jsowell-ui/src/views/order/order/orderDetail.vue +++ b/jsowell-ui/src/views/order/order/orderDetail.vue @@ -234,6 +234,12 @@ export default { this.dialogVisible = true; }, confirmManualSettlement() { + if (this.manualSettlementParam.chargingAmount == null) { + return false; + } + if (this.manualSettlementParam.chargingDegree == null) { + return false; + } this.manualSettlementParam.orderCode = this.orderInfo[0].orderCode; console.log("确认手动结算订单param:", this.manualSettlementParam); manualSettlementOrder(this.manualSettlementParam).then(response => {