From 44165f4dac5561c3b7631c339c92aaecc4282c55 Mon Sep 17 00:00:00 2001
From: attiya <2413103649@qq.com>
Date: Thu, 17 Apr 2025 15:46:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E9=94=81=E9=80=BB=E8=BE=91=E5=B0=81?=
 =?UTF-8?q?=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/UserOrdersServiceImpl.java      | 16 +++++++++++-----
 1 file changed, 11 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 67805070..c3cfa53b 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
@@ -2,7 +2,6 @@ package com.cdzy.orders.service.impl;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.cdzy.common.enums.Code;
-import com.cdzy.common.model.CoreResult;
 import com.cdzy.common.model.JsonResult;
 import com.cdzy.common.model.ResGPSDto;
 import com.cdzy.orders.component.EbikeCoreHandler;
@@ -10,10 +9,13 @@ import com.cdzy.orders.enums.CmdCode;
 import com.cdzy.orders.enums.EbikeRegionInOperation;
 import com.cdzy.orders.enums.OrderStatus;
 import com.cdzy.orders.enums.OrderType;
+import com.cdzy.orders.mapper.UserOrdersMapper;
 import com.cdzy.orders.model.dto.req.ReqBikeDto;
 import com.cdzy.orders.model.dto.req.ReqOrderDto;
 import com.cdzy.orders.model.dto.res.RedisPoint;
 import com.cdzy.orders.model.dto.res.RspBikeDto;
+import com.cdzy.orders.model.entity.UserOrders;
+import com.cdzy.orders.service.UserOrdersService;
 import com.cdzy.orders.uitls.RedisUtil;
 import com.cdzy.orders.uitls.TimeUtils;
 import com.ebike.feign.clients.MaintenanceFeignClient;
@@ -24,9 +26,6 @@ import com.ebike.feign.model.rsp.FeignEbikeEcuInfo;
 import com.ebike.feign.model.rsp.FeignEbikeRegionDto;
 import com.mybatisflex.core.query.QueryWrapper;
 import com.mybatisflex.spring.service.impl.ServiceImpl;
-import com.cdzy.orders.model.entity.UserOrders;
-import com.cdzy.orders.mapper.UserOrdersMapper;
-import com.cdzy.orders.service.UserOrdersService;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -121,6 +120,7 @@ public class UserOrdersServiceImpl extends ServiceImpl<UserOrdersMapper, UserOrd
 
     @Override
     public Long doneRide(ReqOrderDto orderDto) {
+        String userId = orderDto.getUserId();
         UserOrders userOrders = getOrder(orderDto);
         userOrders.setEndTime(LocalDateTime.now());
         JsonResult<FeignEbikeBikeInfoDto> jsonResult = maintenanceFeignClient.getEbikeInfoByCode(orderDto.getBikeCode());
@@ -150,7 +150,13 @@ public class UserOrdersServiceImpl extends ServiceImpl<UserOrdersMapper, UserOrd
         //TODO:区域校验：校验是否在停车区内;时间校验：根据规则做时间校验、判断收费多少.需要支付则为待支付状态、不需要则为取消状态
         userOrders.setStatus(OrderStatus.PENDING_PAYMENT);
         userOrdersMapper.update(userOrders);
-        //TODO:关锁
+        //关锁,并且等待结果
+        CompletableFuture<String> stringCompletableFuture = ebikeCoreHandler.executeCommand(ecuInfo, CmdCode.LOCK, Long.valueOf(bikeInfoDto.getBikeId()), userId);
+        String response = stringCompletableFuture.join();
+        JSONObject jsonObject = JSONObject.parseObject(response);
+        if (jsonObject.getInteger("code") != 0) {
+            throw new RuntimeException("关锁失败");
+        }
         return userOrders.getOrderId();
     }