From 9eeb62c02a7b3c7b95c20678b6a9c74e7f12f943 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 01 七月 2026 18:15:10 +0800
Subject: [PATCH] Merge branch '3.0.1' of http://139.186.142.91:10010/r/productDev/parkBike into 3.0.1
---
server/services/src/main/java/com/doumee/service/business/ReportService.java | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/ReportService.java b/server/services/src/main/java/com/doumee/service/business/ReportService.java
index 4438117..d1d5baf 100644
--- a/server/services/src/main/java/com/doumee/service/business/ReportService.java
+++ b/server/services/src/main/java/com/doumee/service/business/ReportService.java
@@ -3,11 +3,14 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.vo.BikeIncomeStatVO;
+import com.doumee.dao.business.vo.BikeUsageStatVO;
+import com.doumee.dao.business.vo.DashboardVO;
import com.doumee.dao.business.vo.IncomeStatVO;
import com.doumee.dao.business.vo.OperationCenterVO;
import com.doumee.dao.business.vo.OperationOrderVO;
import com.doumee.dao.business.vo.OrderRidesDetailVO;
import com.doumee.dao.business.vo.OverviewStatVO;
+import com.doumee.dao.business.vo.PackageSourceStatVO;
import com.doumee.dao.business.web.request.BikeIncomeQueryDTO;
import com.doumee.dao.business.web.request.OperationOrderQueryDTO;
@@ -68,4 +71,35 @@
* @return 楠戣璁板綍涓庤建杩硅鎯�(鍚溅杈嗙被鍨嬨�佹槸鍚︽湁杞ㄨ抗銆侀獞琛屽垪琛ㄥ強姣忔潯涓嬫寕鐨勮建杩圭偣)
*/
OrderRidesDetailVO orderRidesDetail(String orderId);
+
+ /**
+ * 杩�30澶╂敹鐩婄粺璁�(鍥哄畾30澶�,鏃犻渶鍏ュ弬):鎸夋棩鏌辩姸鍥� + 绱 + 鐜瘮/鍚屾瘮銆�
+ * <p>鍙ｅ緞鍚� {@link #incomeStat},鍐呴儴浠� dateType=3(杩�30澶�)璋冪敤銆�
+ *
+ * @return 杩�30澶╂敹鐩婄粺璁＄粨鏋�
+ */
+ IncomeStatVO incomeStat30();
+
+ /**
+ * 杞﹁締浣跨敤鎯呭喌:鑷杞�/鐢靛姩杞﹀悇鑷殑浣跨敤涓�(status=1)涓庣┖闂�(status=0)鏁伴噺銆�
+ * <p>绂佺敤杞﹁締(status=3)涓嶈鍏ャ��
+ *
+ * @return 杞﹁締浣跨敤鎯呭喌
+ */
+ BikeUsageStatVO bikeUsageStat();
+
+ /**
+ * 濂楅閿�鍞潵婧愮粺璁�:鏈湀/鏈勾缁村害涓�,鎶栭煶鍏戞崲(payWay=2)涓庡皬绋嬪簭璐拱(payWay=0)鐨勫椁愭暟銆�
+ * <p>鍙ｅ緞:goodsorder type=1 濂楅鍗¤喘涔般�乸ayStatus=1 宸叉敮浠樸��
+ *
+ * @return 濂楅閿�鍞潵婧愮粺璁�
+ */
+ PackageSourceStatVO packageSourceStat();
+
+ /**
+ * 缁煎悎鐪嬫澘:鏈湀/鏄ㄦ棩/浠婃棩鏀剁泭涓庤鍗曟暟銆佽溅杈嗘�绘暟/浣跨敤涓�/绌洪棽,瀹㈡埛鏁扮浉鍏虫殏鎼佺疆銆�
+ *
+ * @return 缁煎悎鐪嬫澘鏁版嵁
+ */
+ DashboardVO dashboard();
}
--
Gitblit v1.9.3