From 7a4fe2272b1f3982bf744ce9fcc889f1f9ebfdd4 Mon Sep 17 00:00:00 2001
From: attiya <2413103649@qq.com>
Date: Wed, 4 Jun 2025 09:50:19 +0800
Subject: [PATCH] =?UTF-8?q?=E9=AA=91=E8=A1=8C=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../feign/clients/MaintenanceFeignClient.java | 16 ++++++++++
 .../controller/EbikeBikeInfoController.java   | 29 +++++++++++++++++++
 .../service/impl/UserOrdersServiceImpl.java   | 20 +++++++------
 3 files changed, 56 insertions(+), 9 deletions(-)

diff --git a/ebike-feign/src/main/java/com/ebike/feign/clients/MaintenanceFeignClient.java b/ebike-feign/src/main/java/com/ebike/feign/clients/MaintenanceFeignClient.java
index 13da8744..28b84567 100644
--- a/ebike-feign/src/main/java/com/ebike/feign/clients/MaintenanceFeignClient.java
+++ b/ebike-feign/src/main/java/com/ebike/feign/clients/MaintenanceFeignClient.java
@@ -135,4 +135,20 @@ public interface MaintenanceFeignClient {
      */
     @PostMapping("ebikeBikeInfo/checkEcuSn")
     JsonResult<List<String>> checkEcuSnWithBikeInOperate(@RequestBody EcuSnDto ecuSnDto);
+
+    /**
+     * 根据车辆id将其设置为骑行中状态
+     * @param bikeId 车辆id
+     * @return 结果
+     */
+    @GetMapping("ebikeBikeInfo/riding")
+    JsonResult<?> riding(String bikeId);
+
+    /**
+     * 根据车辆id将车辆设置为待使用状态
+     * @param bikeId 车辆id
+     * @return 结果
+     */
+    @GetMapping("ebikeBikeInfo/used")
+    JsonResult<?> used(String bikeId);
 }
diff --git a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/controller/EbikeBikeInfoController.java b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/controller/EbikeBikeInfoController.java
index 076b02ab..9891848b 100644
--- a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/controller/EbikeBikeInfoController.java
+++ b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/controller/EbikeBikeInfoController.java
@@ -16,6 +16,7 @@ import com.ebike.feign.model.rsp.EbikeBikeBaseInfo;
 import com.ebike.feign.model.rsp.RspBikeInfo;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
+import com.mybatisflex.core.update.UpdateChain;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
@@ -879,4 +880,32 @@ public class EbikeBikeInfoController {
         List<String> list = ebikeBikeInfoService.checkEcuSn(ecuSnDto);
         return JsonResult.success(list);
     };
+
+    /**
+     * 根据车辆id将车辆设置为骑行中状态
+     * @param bikeId 车辆id
+     * @return 结果
+     */
+    @GetMapping("riding")
+    JsonResult<?> riding(@RequestParam("bikeId")String bikeId){
+        UpdateChain.of(EbikeBikeInfo.class)
+                .set(EbikeBikeInfo::getState, "3")
+                .where(EbikeBikeInfo::getBikeId).eq(bikeId)
+                .update();
+        return JsonResult.success();
+    };
+
+    /**
+     * 根据车辆id将车辆设置为待使用状态
+     * @param bikeId 车辆id
+     * @return 结果
+     */
+    @GetMapping("used")
+    JsonResult<?> used(@RequestParam("bikeId")String bikeId){
+        UpdateChain.of(EbikeBikeInfo.class)
+                .set(EbikeBikeInfo::getState, "2")
+                .where(EbikeBikeInfo::getBikeId).eq(bikeId)
+                .update();
+        return JsonResult.success();
+    };
 }
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 5dbc164f..be38076f 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
@@ -94,13 +94,13 @@ public class UserOrdersServiceImpl extends ServiceImpl<UserOrdersMapper, EbikeUs
             throw new RuntimeException("获取车辆信息失败");
         }
         FeignEbikeBikeInfoDto bikeInfoDto = jsonResult.getData();
-        // TODO:判断车辆状态
-//        if (bikeInfoDto.getUsageStatus() == 1) {
-//            throw new RuntimeException("车辆使用中");
-//        }
-//        if (bikeInfoDto.getUsageStatus() == 1) {
-//            throw new RuntimeException("车辆故障,暂不可用");
-//        }
+        // 判断车辆状态
+        if ("3".equals(bikeInfoDto.getState())) {
+            throw new RuntimeException("车辆使用中");
+        }
+        if ("4".equals(bikeInfoDto.getState())) {
+            throw new RuntimeException("车辆故障,暂不可用");
+        }
         FeignEbikeEcuInfo ecuInfo = bikeInfoDto.getEbikeEcuInfo();
         JsonResult<FeignEbikeRegionDto> operationResult = operateFeignClient.getOperationById(bikeInfoDto.getReginId());
         if (operationResult.getCode() != Code.SUCCESS) {
@@ -127,7 +127,8 @@ public class UserOrdersServiceImpl extends ServiceImpl<UserOrdersMapper, EbikeUs
         //添加借车单量
         Long siteRegionId = redisUtil.isPointInSiteWithSiteRegionId(resGpsDto.getLongitude(), resGpsDto.getLatitude(), regionDto.getOperationRegionId());
         operateFeignClient.addBorrowing(siteRegionId);
-        //TODO:改变骑行状态-骑行中
+        //改变骑行状态-骑行中
+        maintenanceFeignClient.riding(bikeInfoDto.getBikeId());
         userOrders.setBikeId(bikeInfoDto.getBikeId());
         String stringBuilder = resGpsDto.getLongitude() + "," + resGpsDto.getLatitude();
         userOrders.setRidePoint(stringBuilder);
@@ -183,7 +184,8 @@ public class UserOrdersServiceImpl extends ServiceImpl<UserOrdersMapper, EbikeUs
         //添加还车单量
         Long siteRegionId = redisUtil.isPointInSiteWithSiteRegionId(resGpsDto.getLongitude(), resGpsDto.getLatitude(), regionDto.getOperationRegionId());
         operateFeignClient.addReturn(siteRegionId);
-        //TODO:改变骑行状态-待使用
+        //改变骑行状态-待使用
+        maintenanceFeignClient.used(bikeInfoDto.getBikeId());
         return userOrders.getOrderId();
     }