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

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<RealTimeMonitorData> chargingRealTimeData = orderBasicInfoService.getChargingRealTimeData(orderBasicInfo.getTransactionCode());
 			if (CollectionUtils.isNotEmpty(chargingRealTimeData)) {

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 => {