From 280cf5981dbcc7b1ca392b7c0e7985aa042b3195 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 20 三月 2025 17:03:12 +0800
Subject: [PATCH] 111
---
server/services/src/main/java/com/doumee/service/business/GoodsorderService.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 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 dc989d6..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
@@ -5,8 +5,10 @@
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.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;
@@ -19,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;
/**
@@ -151,6 +155,7 @@
*/
GoodsorderDetailDTO getGoodsorderDetailDTO(String id);
+ Integer getVoltageStatus(Bikes bikes);
/**
* 濂楅鍗¤鍗曡鎯�
* @param id
@@ -159,7 +164,6 @@
GoodsorderDetailVO getGoodsorderDetailForDisCount(String id);
/**
* 寮哄埗缁撶畻璁㈠崟
- * @param id
* @return
*/
void closeGoodsorder(Goodsorder order,int type );
@@ -169,7 +173,6 @@
/**
* 閫�娆�
- * @param orderId
*/
void backGoodsorder(GoodsorderBackDTO goodsorderBackDTO);
List<MemberRides> getMemberRidesForClose(String orderid );
@@ -209,4 +212,11 @@
void autoCancelRefunOrder();
+ 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