From a18887bf0bae1e775f7e331917449f66519c9a12 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 21 二月 2025 09:02:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/services/src/main/java/com/doumee/service/business/GoodsorderService.java | 5 +++--
1 files changed, 3 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..91f0931 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,6 +5,7 @@
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.GoodsorderExportVO;
@@ -151,6 +152,7 @@
*/
GoodsorderDetailDTO getGoodsorderDetailDTO(String id);
+ Integer getVoltageStatus(Bikes bikes);
/**
* 濂楅鍗¤鍗曡鎯�
* @param id
@@ -159,7 +161,6 @@
GoodsorderDetailVO getGoodsorderDetailForDisCount(String id);
/**
* 寮哄埗缁撶畻璁㈠崟
- * @param id
* @return
*/
void closeGoodsorder(Goodsorder order,int type );
@@ -169,7 +170,6 @@
/**
* 閫�娆�
- * @param orderId
*/
void backGoodsorder(GoodsorderBackDTO goodsorderBackDTO);
List<MemberRides> getMemberRidesForClose(String orderid );
@@ -209,4 +209,5 @@
void autoCancelRefunOrder();
+ DiscountMember getUseDiscount(String memberId, Integer driveTime);
}
--
Gitblit v1.9.3