From 99f77c0fd2ee8ed8840be5e5f99309b184a09e9f Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期三, 18 十月 2023 11:27:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/service/business/MemberRidesService.java | 44 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 43 insertions(+), 1 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 779dae7..c9ec41d 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,9 +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;
@@ -97,4 +101,42 @@
* @return long
*/
long count(MemberRides memberRides);
+
+ MemberRides findJoinById(String id);
+ /**
+ * 鍒嗛〉鏌ヨ
+ *
+ * @param pageWrap 鍒嗛〉瀵硅薄
+ * @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);
}
--
Gitblit v1.9.3