From e41febdc35acabdba9d2d1185ddce3468bed573e Mon Sep 17 00:00:00 2001
From: attiya <2413103649@qq.com>
Date: Thu, 8 May 2025 09:14:08 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cdzy/orders/service/impl/UserOrdersServiceImpl.java   | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

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 ff7d517d..1c0a23fc 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
@@ -23,7 +23,6 @@ import com.cdzy.orders.uitls.TimeUtils;
 import com.ebike.feign.clients.MaintenanceFeignClient;
 import com.ebike.feign.clients.OperateFeignClient;
 import com.ebike.feign.model.res.ResFeignEbikeSysRcostsetDto;
-import com.ebike.feign.model.res.ResFeignEbikeSysRcostsetTimePeriodDto;
 import com.ebike.feign.model.res.ResFeignEbikeSysRcostsetWeekDto;
 import com.ebike.feign.model.res.ResFeignOrderPaymentDto;
 import com.ebike.feign.model.rsp.FeignEbikeBikeInfoDto;
@@ -37,7 +36,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.time.LocalTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
@@ -107,12 +105,12 @@ public class UserOrdersServiceImpl extends ServiceImpl<UserOrdersMapper, EbikeUs
             throw new RuntimeException("获取运营区信息失败");
         }
         FeignEbikeRegionDto regionDto = operationResult.getData();
-        if (regionDto.getRegionId() == EbikeRegionInOperation.OUT) {
+        if (regionDto.getInOperation() == EbikeRegionInOperation.OUT) {
             throw new RuntimeException("当前运营区已停止运营");
         }
         String jsonString = JSONObject.toJSONString(redisUtil.get(ecuInfo.getEcuSn()));
         ResGPSDto resGpsDto = JSONObject.parseObject(jsonString, ResGPSDto.class);
-        boolean pointInOperation = bikeInOperation(resGpsDto.getLongitude(), resGpsDto.getLatitude(), regionDto.getOrgId(), regionDto.getRegionId());
+        boolean pointInOperation = bikeInOperation(resGpsDto.getLongitude(), resGpsDto.getLatitude(), regionDto.getOrgId(), regionDto.getOperationRegionId());
         if (!pointInOperation) {
             throw new RuntimeException("当前车辆在运营区外");
         }
@@ -343,7 +341,7 @@ public class UserOrdersServiceImpl extends ServiceImpl<UserOrdersMapper, EbikeUs
         BigDecimal totalAmount = BigDecimal.ZERO;
         List<EbikeOrderDetails> list = new ArrayList<>();
         //是否在运营区内
-        boolean pointInOperation = bikeInOperation(resGpsDto.getLongitude(), resGpsDto.getLatitude(), regionDto.getOrgId(), regionDto.getRegionId());
+        boolean pointInOperation = bikeInOperation(resGpsDto.getLongitude(), resGpsDto.getLatitude(), regionDto.getOrgId(), regionDto.getOperationRegionId());
         //是否在停车区内
         boolean pointInParking = redisUtil.isPointInParking(resGpsDto.getLongitude(), resGpsDto.getLatitude(), regionDto.getOrgId());
         long minutes = TimeUtils.betweenMinutes(userOrders.getStartTime(), userOrders.getEndTime());