From bbd837a72bb9ec1bcef044624960345f98969a49 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 26 三月 2026 16:53:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpChargingRecordController.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpChargingRecordController.java b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpChargingRecordController.java
index 0bba13a..c987cac 100644
--- a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpChargingRecordController.java
+++ b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpChargingRecordController.java
@@ -3,6 +3,7 @@
import com.xiaopeng.api.feignClient.account.XpOperationUserClient;
import com.xiaopeng.api.feignClient.vehicleConvoy.XpVehicleClient;
+import com.xiaopeng.api.model.maintenance.XpChargingRecord;
import com.xiaopeng.maintenance.model.query.XpChargingRecordPageQuery;
import com.xiaopeng.common.core.domain.R;
import com.xiaopeng.common.core.web.page.PageInfo;
@@ -66,9 +67,9 @@
public R<String> stopCharging(@RequestBody XpChargingRecordStopDTO dto) {
Long id = tokenService.getLoginOperationUser().getId();
- xpChargingRecordService.stopCharging(dto, id);
+ XpChargingRecord chargingRecord = xpChargingRecordService.stopCharging(dto, id);
//更新任务状态
- xpTaskService.updateTaskStatus(dto.getTaskId(), 2, id);
+ xpTaskService.updateTaskStatus(chargingRecord.getTaskId(), 2, id);
return R.ok();
}
--
Gitblit v1.7.1