From 32cc5d17a4ea541d1c43be6058d219faaec9c494 Mon Sep 17 00:00:00 2001 From: eric <465889110@qq.com> Date: Mon, 29 Sep 2025 14:14:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E8=BF=98=E8=BD=A6=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E5=8F=96=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/sczx/sync/controller/SendDataController.java | 2 +- src/main/resources/mapper/OrderBatteryInfoMapper.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/sczx/sync/controller/SendDataController.java b/src/main/java/com/sczx/sync/controller/SendDataController.java index 4eddd1c..3c8c485 100644 --- a/src/main/java/com/sczx/sync/controller/SendDataController.java +++ b/src/main/java/com/sczx/sync/controller/SendDataController.java @@ -89,7 +89,7 @@ public class SendDataController { log.info("/subOrder 接收充电数据：{}",id); return CompletableFuture .supplyAsync(() -> { - try {sleep(1000); + try { return sendDataService.sendSubOrderToBattery(Long.parseLong(id)); } catch (Exception e) { log.error("处理用户数据时发生异常", e); diff --git a/src/main/resources/mapper/OrderBatteryInfoMapper.xml b/src/main/resources/mapper/OrderBatteryInfoMapper.xml index b32b4c7..719e95f 100644 --- a/src/main/resources/mapper/OrderBatteryInfoMapper.xml +++ b/src/main/resources/mapper/OrderBatteryInfoMapper.xml @@ -23,7 +23,7 @@ zom.customer_phone AS phone, zrb.meal_id AS meal_id, zom.pick_car_time AS start_date, - zom.end_rent_time AS end_date, + zos.return_time AS end_date, zcs.city_id as city, zcs.id as store, zrb.category_id as category,