From 69283b5a4559509187516355602e32e4bdac9d5d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 28 二月 2025 11:54:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/services/src/main/java/com/doumee/service/business/MemberRidesService.java | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 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 c1e0be0..294c6fc 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,14 @@
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.MemberRidesDetailResponse;
+import com.doumee.dao.business.web.response.MemberRidesResponse;
import java.util.List;
@@ -99,7 +103,7 @@
*/
long count(MemberRides memberRides);
-
+ MemberRides findJoinById(String id);
/**
* 鍒嗛〉鏌ヨ
*
@@ -113,6 +117,32 @@
* @param memberId
* @return
*/
- String getOnlineBike(String memberId);
+ MemberRides getOnlineBike(String memberId);
+ /**
+ * 鎵爜瑙ｉ攣
+ * @param code
+ * @param memberId
+ * @return
+ */
+ MemberRidesDetailResponse openLock(String code, String memberId);
+
+ /**
+ * 鍒锋柊瑙ｉ攣鎯呭喌
+ * @param id
+ * @return
+ */
+ MemberRidesDetailResponse refreshLock(String id);
+
+ MemberRidesResponse getBikeChargingRule(String code, String memberId);
+
+ void updateDuration(MemberRides memberRides);
+
+ void forceBack(MemberRides memberRides);
+
+ int mqttCloseBikeEvent(MemberRides bikes);
+
+ int mqttLockInfoEvent(Locks locks);
+
+ void autoRefreshLockStatus();
}
--
Gitblit v1.9.3