From d62f6b5b17628370862a7f4ea1866433b4066e64 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Thu, 16 Mar 2023 15:24:52 +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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jsowell/service/OrderService.java | 9 +++++---- .../web/controller/pile/OrderBasicInfoController.java | 5 ++--- 2 files changed, 7 insertions(+), 7 deletions(-) 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 7b9d81754..4f6de9e4e 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -820,18 +820,18 @@ public class OrderService { * 人工结算订单 * @param dto */ - public void manualSettlementOrder(QueryOrderDTO dto) { + public boolean manualSettlementOrder(QueryOrderDTO dto) { // 查询订单 OrderBasicInfo orderBasicInfo = orderBasicInfoService.getOrderInfoByOrderCode(dto.getOrderCode()); if (orderBasicInfo == null) { log.info("人工结算订单-根据订单号:{}, 查询为null", dto.getOrderCode()); - return; + return false; } // 当前登录用户，是否可以结算该订单 AuthorizedDeptVO authorizedMap = SecurityUtils.getAuthorizedMap(); if (authorizedMap == null) { log.info("人工结算订单-当前登录管理员无权限"); - return; + return false; } List stationDeptIds = authorizedMap.getStationDeptIds(); @@ -844,7 +844,7 @@ public class OrderService { List chargingRealTimeData = orderBasicInfoService.getChargingRealTimeData(orderBasicInfo.getTransactionCode()); if (CollectionUtils.isEmpty(chargingRealTimeData)) { log.info("人工结算订单-根据订单号:{},查不到充电桩上传的实时数据，无法进行结算", dto.getOrderCode()); - return; + return false; } RealTimeMonitorData realTimeMonitorData = chargingRealTimeData.get(0); @@ -859,5 +859,6 @@ public class OrderService { // 发送停止充电指令 pileRemoteService.remoteStopCharging(orderBasicInfo.getPileSn(), orderBasicInfo.getConnectorCode()); + return true; } } diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java index e89563303..1084a6ffa 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java @@ -109,8 +109,7 @@ public class OrderBasicInfoController extends BaseController { * http://localhost:8080/order/manualSettlementOrder */ @PostMapping("/manualSettlementOrder") - public RestApiResponse manualSettlementOrder(@RequestBody QueryOrderDTO dto) { - orderService.manualSettlementOrder(dto); - return null; + public AjaxResult manualSettlementOrder(@RequestBody QueryOrderDTO dto) { + return toAjax(orderService.manualSettlementOrder(dto)); } }