From f74ed9f2667feb368c24ac8dee57623a345cd926da6d18055592f2ef48683197 Mon Sep 17 00:00:00 2001
From: yanglei <yanglei@stargraph.cn>
Date: Fri, 30 Jan 2026 12:15:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E8=AF=A6=E6=83=85=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E8=BD=A6=E8=BE=86=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../feign/model/dto/FeignEbikeUserBikeInfo.java    |  8 +++++++-
 .../operations/model/dto/EbikeUserBikeInfo.java    | 14 ++++++++++++--
 .../service/impl/EbikeBikeInfoServiceImpl.java     |  1 +
 .../com/cdzy/user/model/vo/EbikeBikeInfoVo.java    | 12 ++++++++++++
 .../user/service/impl/EbikeOrderServiceImpl.java   |  1 +
 5 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/ebike-feign/src/main/java/com/ebike/feign/model/dto/FeignEbikeUserBikeInfo.java b/ebike-feign/src/main/java/com/ebike/feign/model/dto/FeignEbikeUserBikeInfo.java
index 1f527e6..c28172d 100644
--- a/ebike-feign/src/main/java/com/ebike/feign/model/dto/FeignEbikeUserBikeInfo.java
+++ b/ebike-feign/src/main/java/com/ebike/feign/model/dto/FeignEbikeUserBikeInfo.java
@@ -4,6 +4,7 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.locationtech.jts.geom.Point;
 import org.locationtech.jts.geom.Polygon;
 
 import java.io.Serial;
@@ -11,7 +12,7 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 
 /**
- *  实体类。
+ * 实体类。
  *
  * @author attiya
  * @since 2025-10-21
@@ -103,4 +104,9 @@ public class FeignEbikeUserBikeInfo implements Serializable {
      */
     private Polygon regionPolygon;
 
+    /**
+     * 车辆当前位置
+     */
+    private Point location;
+
 }
diff --git a/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeUserBikeInfo.java b/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeUserBikeInfo.java
index 54e2ca5..888be83 100644
--- a/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeUserBikeInfo.java
+++ b/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeUserBikeInfo.java
@@ -1,5 +1,8 @@
 package com.cdzy.operations.model.dto;
 
+import com.cdzy.operations.handler.PointDeserializer;
+import com.cdzy.operations.handler.PointSerializer;
+import com.cdzy.operations.handler.PointTypeHandler;
 import com.cdzy.operations.handler.PolygonDeserializer;
 import com.cdzy.operations.handler.PolygonSerializer;
 import com.cdzy.operations.handler.PolygonTypeHandler;
@@ -10,6 +13,7 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.locationtech.jts.geom.Point;
 import org.locationtech.jts.geom.Polygon;
 
 import java.io.Serial;
@@ -17,7 +21,7 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 
 /**
- *  实体类。
+ * 实体类。
  *
  * @author attiya
  * @since 2025-10-21
@@ -112,5 +116,11 @@ public class EbikeUserBikeInfo implements Serializable {
     @JsonDeserialize(using = PolygonDeserializer.class)
     private Polygon regionPolygon;
 
-
+    /**
+     * 当前位置
+     */
+    @Column(typeHandler = PointTypeHandler.class)
+    @JsonSerialize(using = PointSerializer.class)
+    @JsonDeserialize(using = PointDeserializer.class)
+    private Point location;
 }
diff --git a/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeInfoServiceImpl.java b/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeInfoServiceImpl.java
index eff0fb6..f1b445b 100644
--- a/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeInfoServiceImpl.java
+++ b/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeInfoServiceImpl.java
@@ -450,6 +450,7 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
                     .helmetManagementFee(configurations.getHelmetManagementFee())
                     .soc(soc)
                     .regionPolygon(region.getRegionPolygon())
+                    .location(info.getLocation())
                     .build();
         } else {
             EbikeUserBikeInfo userBikeInfo = EbikeUserBikeInfo.builder()
diff --git a/ebike-user/src/main/java/com/cdzy/user/model/vo/EbikeBikeInfoVo.java b/ebike-user/src/main/java/com/cdzy/user/model/vo/EbikeBikeInfoVo.java
index 5ef4486..a368229 100644
--- a/ebike-user/src/main/java/com/cdzy/user/model/vo/EbikeBikeInfoVo.java
+++ b/ebike-user/src/main/java/com/cdzy/user/model/vo/EbikeBikeInfoVo.java
@@ -1,5 +1,8 @@
 package com.cdzy.user.model.vo;
 
+import com.cdzy.user.handler.PointDeserializer;
+import com.cdzy.user.handler.PointSerializer;
+import com.cdzy.user.handler.PointTypeHandler;
 import com.cdzy.user.handler.PolygonDeserializer;
 import com.cdzy.user.handler.PolygonSerializer;
 import com.cdzy.user.handler.PolygonTypeHandler;
@@ -10,6 +13,7 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.locationtech.jts.geom.Point;
 import org.locationtech.jts.geom.Polygon;
 
 import java.io.Serializable;
@@ -111,4 +115,12 @@ public class EbikeBikeInfoVo implements Serializable {
     @JsonSerialize(using = PolygonSerializer.class)
     @JsonDeserialize(using = PolygonDeserializer.class)
     private Polygon regionPolygon;
+
+    /**
+     * 车辆当前位置
+     */
+    @Column(typeHandler = PointTypeHandler.class)
+    @JsonSerialize(using = PointSerializer.class)
+    @JsonDeserialize(using = PointDeserializer.class)
+    private Point location;
 }
diff --git a/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeOrderServiceImpl.java b/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeOrderServiceImpl.java
index 5a6dc2f..7008dde 100644
--- a/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeOrderServiceImpl.java
+++ b/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeOrderServiceImpl.java
@@ -248,6 +248,7 @@ public class EbikeOrderServiceImpl extends ServiceImpl<EbikeOrderMapper, EbikeOr
                 .noParkingZoneFee(source.getNoParkingZoneFee())
                 .helmetManagementFee(source.getHelmetManagementFee())
                 .regionPolygon(source.getRegionPolygon())
+                .location(source.getLocation())
                 .build();
     }