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/GoodsorderService.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/GoodsorderService.java b/server/services/src/main/java/com/doumee/service/business/GoodsorderService.java
index 9a570bf..a63ecaa 100644
--- a/server/services/src/main/java/com/doumee/service/business/GoodsorderService.java
+++ b/server/services/src/main/java/com/doumee/service/business/GoodsorderService.java
@@ -8,6 +8,7 @@
import com.doumee.dao.business.model.DiscountMember;
import com.doumee.dao.business.model.Goodsorder;
import com.doumee.dao.business.model.MemberRides;
+import com.doumee.dao.business.vo.BikeIncomeReportVO;
import com.doumee.dao.business.vo.GoodsorderExportVO;
import com.doumee.dao.business.vo.GoodsorderTotalDataVO;
import com.doumee.dao.business.web.request.BackElecBikeRequest;
@@ -20,7 +21,9 @@
import com.wechat.pay.java.service.refund.model.RefundNotification;
import io.swagger.models.auth.In;
+import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
+import java.util.Date;
import java.util.List;
/**
@@ -212,4 +215,8 @@
DiscountMember getUseDiscount(String memberId, Integer driveTime,Integer type);
void autCancel();
+
+ List<List<String>> getBikeIncomeReportVOList(Date startDate , Date endDate);
+
+ void excel(Date startDate , Date endDate, HttpServletResponse response);
}
--
Gitblit v1.9.3