手动结算订单

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<String> stationDeptIds = authorizedMap.getStationDeptIds();
@@ -844,7 +844,7 @@ public class OrderService {
 		List<RealTimeMonitorData> 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;
 	}
 }

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) {
+	public AjaxResult manualSettlementOrder(@RequestBody QueryOrderDTO dto) {
-		orderService.manualSettlementOrder(dto);
+		return toAjax(orderService.manualSettlementOrder(dto));
-		return null;
 	}
 }