From 9a1c4a3b1bea94fc717269c54b970e7d87481a1e9205700374c12e0b90c79d14 Mon Sep 17 00:00:00 2001
From: attiya <2413103649@qq.com>
Date: Fri, 12 Dec 2025 09:52:06 +0800
Subject: [PATCH] =?UTF-8?q?=E9=AA=91=E8=A1=8C=E6=9F=A5=E7=9C=8B=E8=BF=90?=
 =?UTF-8?q?=E8=90=A5=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../feign/model/dto/FeignEbikeUserBikeInfo.java   |  7 +++++--
 .../operations/model/dto/EbikeUserBikeInfo.java   | 15 +++++++++++++++
 .../service/impl/EbikeBikeInfoServiceImpl.java    | 14 ++++++++++++++
 3 files changed, 34 insertions(+), 2 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 70feb0d..80d749b 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
@@ -1,10 +1,10 @@
 package com.ebike.feign.model.dto;
 
-import com.mybatisflex.annotation.Table;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.postgresql.geometric.PGpolygon;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -20,7 +20,6 @@ import java.math.BigDecimal;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-@Table("ebike_bike_info")
 public class FeignEbikeUserBikeInfo implements Serializable {
 
     @Serial
@@ -99,5 +98,9 @@ public class FeignEbikeUserBikeInfo implements Serializable {
      */
     private BigDecimal helmetManagementFee;
 
+    /**
+     * 车辆运营区
+     */
+    private PGpolygon regionPolygon;
 
 }
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 8a5173d..7d8f7e5 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,9 +1,16 @@
 package com.cdzy.operations.model.dto;
 
+import com.cdzy.operations.handler.PGpolygonDeserializer;
+import com.cdzy.operations.handler.PGpolygonSerializer;
+import com.cdzy.operations.handler.PGpolygonTypeHandler;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.mybatisflex.annotation.Column;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.postgresql.geometric.PGpolygon;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -97,5 +104,13 @@ public class EbikeUserBikeInfo implements Serializable {
      */
     private BigDecimal helmetManagementFee;
 
+    /**
+     * 运营区域
+     */
+    @Column(typeHandler = PGpolygonTypeHandler.class)
+    @JsonSerialize(using = PGpolygonSerializer.class)
+    @JsonDeserialize(using = PGpolygonDeserializer.class)
+    private PGpolygon regionPolygon;
+
 
 }
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 9dd9a01..7219bfa 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
@@ -97,6 +97,9 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
     @Resource
     private EbikeDispatchConfigurationService dispatchConfigurationService;
 
+    @Resource
+    private EbikeRegionMapper ebikeRegionMapper;
+
     @Override
     @Transactional
     public void bind(EbikeBikeBindVo bindVo) {
@@ -368,6 +371,9 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
         QueryWrapper query = QueryWrapper.create()
                 .where(EBIKE_BIKE_INFO.BIKE_CODE.eq(bikeCode));
         EbikeBikeInfo info = this.mapper.selectOneByQuery(query);
+        if (info == null) {
+            throw new EbikeException("车辆编号错误");
+        }
 
         query.clear();
         query.where(EBIKE_DEFAULT_BILLING_CONFIGURATION.REGION_ID.eq(info.getRegionId()));
@@ -381,6 +387,12 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
         query.clear();
         query.where(EBIKE_ECU_INFO.ECU_ID.eq(info.getEcuId()));
         EbikeEcuInfo ecuInfo = ebikeEcuInfoService.getOne(query);
+
+
+        query.clear();
+        query.where(EBIKE_REGION.REGION_ID.eq(info.getRegionId()));
+        EbikeRegion region = ebikeRegionMapper.selectOneByQuery(query);
+
         int soc = 0;
         if (ecuInfo != null) {
             ResGPSDto resGPSDto = (ResGPSDto) redisUtil.getEcu(ecuInfo.getEcuSn());
@@ -402,6 +414,7 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
                     .noParkingZoneFee(configurations.getNoParkingZoneFee())
                     .helmetManagementFee(configurations.getHelmetManagementFee())
                     .soc(soc)
+                    .regionPolygon(region.getRegionPolygon())
                     .build();
         } else {
             EbikeUserBikeInfo userBikeInfo = EbikeUserBikeInfo.builder()
@@ -419,6 +432,7 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
                     .noParkingZoneFee(configurations.getNoParkingZoneFee())
                     .helmetManagementFee(configurations.getHelmetManagementFee())
                     .soc(soc)
+                    .regionPolygon(region.getRegionPolygon())
                     .build();
             if (specialBillingConfiguration.getType() == SpecialBillingConfigurationType.DAY) {
                 query.clear();