From 2eeb6e98e41b5b2b1a9659a92d046dd8689a1877 Mon Sep 17 00:00:00 2001
From: attiya <2413103649@qq.com>
Date: Fri, 16 May 2025 16:09:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=81=9C=E8=BD=A6=E4=BF=A1=E6=81=AF=E7=BC=93?=
 =?UTF-8?q?=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/cdzy/common/model/ResGPSDto.java     | 15 +++++++++++++++
 .../controller/EbikeUserOrdersController.java     |  5 ++---
 .../service/impl/UserOrdersServiceImpl.java       |  6 ++++--
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/ebike-common/src/main/java/com/cdzy/common/model/ResGPSDto.java b/ebike-common/src/main/java/com/cdzy/common/model/ResGPSDto.java
index 9726ba90..854e14f4 100644
--- a/ebike-common/src/main/java/com/cdzy/common/model/ResGPSDto.java
+++ b/ebike-common/src/main/java/com/cdzy/common/model/ResGPSDto.java
@@ -93,4 +93,19 @@ public class ResGPSDto {
      * ecuSn
      */
     private String ecuSn;
+
+    /**
+     * 是否在运营区（记录最后一次停车
+     */
+    private Boolean inOperation;
+
+    /**
+     * 是否在停车区（记录最后一次停车
+     */
+    private Boolean inParking;
+
+    /**
+     * 最后一次还车时间
+     */
+    private Number latestTimestamp;
 }
diff --git a/ebike-orders/src/main/java/com/cdzy/orders/controller/EbikeUserOrdersController.java b/ebike-orders/src/main/java/com/cdzy/orders/controller/EbikeUserOrdersController.java
index 26e93dcc..b65491ca 100644
--- a/ebike-orders/src/main/java/com/cdzy/orders/controller/EbikeUserOrdersController.java
+++ b/ebike-orders/src/main/java/com/cdzy/orders/controller/EbikeUserOrdersController.java
@@ -5,12 +5,12 @@ import com.cdzy.common.model.PageParam;
 import com.cdzy.orders.model.dto.req.ReqBikeDto;
 import com.cdzy.orders.model.dto.req.ReqOrderDetailsDto;
 import com.cdzy.orders.model.dto.req.ReqOrderDto;
+import com.cdzy.orders.model.dto.res.RspBikeDto;
 import com.cdzy.orders.model.dto.res.RspOrderDetailsInfo;
 import com.cdzy.orders.model.dto.res.RspOrderDetailsUserList;
-import com.ebike.feign.model.res.ResFeignOrderPaymentDto;
-import com.cdzy.orders.model.dto.res.RspBikeDto;
 import com.cdzy.orders.model.entity.EbikeUserOrders;
 import com.cdzy.orders.service.UserOrdersService;
+import com.ebike.feign.model.res.ResFeignOrderPaymentDto;
 import com.ebike.feign.model.rsp.EbikePaymentDto;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
@@ -21,7 +21,6 @@ import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
 import java.util.List;
-import java.util.Map;
 
 import static com.cdzy.orders.model.entity.table.EbikeUserOrdersTableDef.EBIKE_USER_ORDERS;
 
diff --git a/ebike-orders/src/main/java/com/cdzy/orders/service/impl/UserOrdersServiceImpl.java b/ebike-orders/src/main/java/com/cdzy/orders/service/impl/UserOrdersServiceImpl.java
index 3e5967fd..b2de7098 100644
--- a/ebike-orders/src/main/java/com/cdzy/orders/service/impl/UserOrdersServiceImpl.java
+++ b/ebike-orders/src/main/java/com/cdzy/orders/service/impl/UserOrdersServiceImpl.java
@@ -1,6 +1,5 @@
 package com.cdzy.orders.service.impl;
 
-import cn.hutool.core.map.MapUtil;
 import com.alibaba.fastjson2.JSONObject;
 import com.cdzy.common.enums.Code;
 import com.cdzy.common.model.JsonResult;
@@ -44,7 +43,6 @@ import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 
 import static com.cdzy.orders.enums.TimeDivisionCharging.TIME_SLOT;
@@ -473,6 +471,10 @@ public class UserOrdersServiceImpl extends ServiceImpl<UserOrdersMapper, EbikeUs
             list.add(orderDetails);
             totalAmount = totalAmount.add(operationAreaSchedulingFee);
         }
+        resGpsDto.setInOperation(pointInOperation);
+        resGpsDto.setInParking(pointInParking);
+        resGpsDto.setLatestTimestamp(System.currentTimeMillis());
+        redisUtil.set(resGpsDto.getEcuSn(),regionDto);
         //时长费用计算(已知超出免费时长
         Character timeDivisionCharging = feignEbikeSysRcostsetDto.getTimeDivisionCharging();
         BigDecimal decimal = switch (timeDivisionCharging) {