From cf1d82548a1bd8155ffe9b486df8167aa9e63a7d Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 02 七月 2026 09:19:06 +0800
Subject: [PATCH] 功能开发
---
server/services/src/main/java/com/doumee/service/business/GoodsorderService.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 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..c8fb0ca 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;
/**
@@ -169,9 +172,16 @@
void forceCloseGoodsorder(String orderId);
/**
- * 閫�娆�
+ * 閫�娆�(鐧诲綍浜轰粠 Shiro 涓婁笅鏂囧彇,platform 绔敤)
*/
void backGoodsorder(GoodsorderBackDTO goodsorderBackDTO);
+
+ /**
+ * 閫�娆�(鐧诲綍浜虹敱璋冪敤鏂逛紶鍏�,web 绔� JWT 鍦烘櫙鐢�,creator=缁戝畾鐨勭鐞嗗憳ID)
+ * @param goodsorderBackDTO 閫�娆惧叆鍙�
+ * @param creator 鎿嶄綔浜篒D(閫�娆惧崟 + 濂楅鎿嶄綔鏃ュ織鐨� creator)
+ */
+ void backGoodsorder(GoodsorderBackDTO goodsorderBackDTO, String creator);
List<MemberRides> getMemberRidesForClose(String orderid );
/**
* 鑾峰彇鍙��娆句俊鎭�
@@ -212,4 +222,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