From 15220b607d14880a87ec6d7565c0d68cbe9b5ba4 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 12 十月 2023 18:15:49 +0800
Subject: [PATCH] 111

---
 server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java |   21 ++++++++++-----------
 1 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
index 651cd0c..a52597a 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
@@ -377,20 +377,19 @@
         }
         ;
         Locks locks = locksMapper.selectOne(new QueryWrapper<Locks>().eq("code", code).eq("isdeleted", Constants.ZERO).last("limit 1"));
+        if (Objects.isNull(locks)) {
+            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "鎵爜鏃犳晥锛屾湭鏌ヨ鍒伴攣澶翠俊鎭�");
+        }
+        //鏌ヨ閿佸ご鏄惁瀛樺湪杞﹁締 浠ュ強鏄惁姝e父
+        if (!locks.getStatus().equals(Constants.ZERO)) {
+            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "褰撳墠鎵爜閿佸ご鐘舵�侀敊璇紝鏃犳硶杩涜寮�閿�");
+        }
+        if (StringUtils.isBlank(locks.getBikeCode())) {
+            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "褰撳墠鎵爜閿佸ご鏃犺溅杈嗕俊鎭紝鏃犳硶杩涜寮�閿�");
+        }
         MqttLog flag = deviceService.openLock(locks);
         MemberRidesDetailResponse memberRidesDetailResponse = new MemberRidesDetailResponse();
         if (flag.getResult() == 0) {
-
-            if (Objects.isNull(locks)) {
-                throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "鎵爜鏃犳晥锛屾湭鏌ヨ鍒伴攣澶翠俊鎭�");
-            }
-            //鏌ヨ閿佸ご鏄惁瀛樺湪杞﹁締 浠ュ強鏄惁姝e父
-            if (!locks.getStatus().equals(Constants.ZERO)) {
-                throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "褰撳墠鎵爜閿佸ご鐘舵�侀敊璇紝鏃犳硶杩涜寮�閿�");
-            }
-            if (StringUtils.isBlank(locks.getBikeCode())) {
-                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "褰撳墠鎵爜閿佸ご鏃犺溅杈嗕俊鎭紝鏃犳硶杩涜寮�閿�");
-            }
             //瀛樺偍楠戣璁板綍
             MemberRides memberRides = new MemberRides();
             memberRides.setId(Constants.getUUID());

--
Gitblit v1.9.3