diff --git a/ebike-feign/src/main/java/com/ebike/feign/clients/OperationsFeignClient.java b/ebike-feign/src/main/java/com/ebike/feign/clients/OperationsFeignClient.java index aca9865..4ace70c 100644 --- a/ebike-feign/src/main/java/com/ebike/feign/clients/OperationsFeignClient.java +++ b/ebike-feign/src/main/java/com/ebike/feign/clients/OperationsFeignClient.java @@ -166,4 +166,18 @@ public interface OperationsFeignClient { */ @GetMapping("/ebikeBikeInfo/api/getAllSiteByBikeCode") JsonResult> getAllSiteByBikeCode(@RequestParam("bikeCode") String bikeCode); + + /** + * 临时停车 + * @param bikeCode 车辆编号 + */ + @GetMapping("/ebikeBikeInfo/api/tempLock") + JsonResult tempLock(@RequestParam("bikeCode") String bikeCode); + + /** + * 临时停车继续骑行 + * @param bikeCode 车辆编号 + */ + @GetMapping("/ebikeBikeInfo/api/tempLockResume") + JsonResult tempLockResume(@RequestParam("bikeCode") String bikeCode); } 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 5bff4a8..657e5f7 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 @@ -373,23 +373,20 @@ public class EbikeOrderServiceImpl extends ServiceImpl jsonResult = operationsFeignClient.lock(ebikeLockVo); + JsonResult jsonResult = operationsFeignClient.tempLock(tempLockDto.getBikeCode()); if (jsonResult.getCode() != Code.SUCCESS) { - throw new EbikeException("临时关锁失败:" + jsonResult.getMessage()); + throw new EbikeException("临时停车关锁失败:" + jsonResult.getMessage()); } } else if (tempLockDto.getLockStatus().equals(EbikeTempLockStatus.OPEN)) { - // 开锁 - JsonResult jsonResult = operationsFeignClient.openLock(tempLockDto.getBikeCode()); + // 临时停车继续骑行 + JsonResult jsonResult = operationsFeignClient.tempLockResume(tempLockDto.getBikeCode()); if (jsonResult.getCode() != Code.SUCCESS) { - throw new EbikeException("开锁失败:" + jsonResult.getMessage()); + throw new EbikeException("临时停车继续骑行开锁失败:" + jsonResult.getMessage()); } } ebikeOrder.setTempLock(tempLockDto.getLockStatus());