From 1e676b408c8c7e1ccca08b151619d89fdc2bc9bf Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 10 十月 2023 14:40:31 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/parkBike into dev
---
server/services/src/main/java/com/doumee/service/business/MemberRidesService.java | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 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 2f7a277..53c11c8 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
@@ -3,6 +3,10 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.MemberRides;
+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 java.util.List;
/**
@@ -14,7 +18,7 @@
/**
* 鍒涘缓
- *
+ *
* @param memberRides 瀹炰綋瀵硅薄
* @return String
*/
@@ -78,14 +82,14 @@
* @return List<MemberRides>
*/
List<MemberRides> findList(MemberRides memberRides);
-
+
/**
* 鍒嗛〉鏌ヨ
*
* @param pageWrap 鍒嗛〉瀵硅薄
* @return PageData<MemberRides>
*/
- PageData<MemberRides> findPage(PageWrap<MemberRides> pageWrap);
+ PageData<MemberRidesDTO> findPage(PageWrap<MemberRidesQuery> pageWrap);
/**
* 鏉′欢缁熻
@@ -94,4 +98,21 @@
* @return long
*/
long count(MemberRides memberRides);
+
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ *
+ * @param pageWrap 鍒嗛〉瀵硅薄
+ * @return PageData<MemberRides>
+ */
+ PageData<BikeLogDTO> findBikeLog(PageWrap<MemberRidesQuery> pageWrap);
+
+ /**
+ * 鏌ヨ鐢ㄦ埛楠戣涓殑杞﹁締
+ * @param memberId
+ * @return
+ */
+ String getOnlineBike(String memberId);
+
}
--
Gitblit v1.9.3