From 1b0cf0db5c82ea8308d2f338973a91555787c34d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 三月 2025 11:17:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/service/business/MemberRidesService.java | 38 ++++++++++++++++++++++++++++++++++++--
1 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/MemberRidesService.java b/server/services/src/main/java/com/doumee/service/business/MemberRidesService.java
index d886882..bd381c4 100644
--- a/server/services/src/main/java/com/doumee/service/business/MemberRidesService.java
+++ b/server/services/src/main/java/com/doumee/service/business/MemberRidesService.java
@@ -2,10 +2,13 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.dao.business.model.Bikes;
+import com.doumee.dao.business.model.Locks;
import com.doumee.dao.business.model.MemberRides;
+import com.doumee.dao.business.web.request.MemberRidesQuery;
import com.doumee.dao.business.web.response.BikeLogDTO;
import com.doumee.dao.business.web.response.MemberRidesDTO;
-import com.doumee.dao.business.web.response.MemberRidesQuery;
+import com.doumee.dao.business.web.response.MemberRidesDetailResponse;
import java.util.List;
@@ -99,7 +102,7 @@
*/
long count(MemberRides memberRides);
-
+ MemberRides findJoinById(String id);
/**
* 鍒嗛〉鏌ヨ
*
@@ -107,4 +110,35 @@
* @return PageData<MemberRides>
*/
PageData<BikeLogDTO> findBikeLog(PageWrap<MemberRidesQuery> pageWrap);
+
+ /**
+ * 鏌ヨ鐢ㄦ埛楠戣涓殑杞﹁締
+ * @param memberId
+ * @return
+ */
+ MemberRides getOnlineBike(String memberId);
+
+ /**
+ * 鎵爜瑙ｉ攣
+ * @param code
+ * @param memberId
+ * @return
+ */
+ MemberRidesDetailResponse openLock(String code, String memberId);
+
+ /**
+ * 鍒锋柊瑙ｉ攣鎯呭喌
+ * @param id
+ * @return
+ */
+ MemberRidesDetailResponse refreshLock(String id);
+ void updateDuration(MemberRides memberRides);
+
+ void forceBack(MemberRides memberRides);
+
+ int mqttCloseBikeEvent(MemberRides bikes);
+
+ int mqttLockInfoEvent(Locks locks);
+
+ void autoRefreshLockStatus();
}
--
Gitblit v1.9.3