From 04dba6a17f836b5fbdf0eedff8a129c6785fd8a2 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 28 二月 2025 18:25:00 +0800
Subject: [PATCH] 111
---
server/services/src/main/java/com/doumee/service/business/GoodsorderService.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 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 d7bd238..9a570bf 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;
@@ -12,6 +13,7 @@
import com.doumee.dao.business.web.request.BackElecBikeRequest;
import com.doumee.dao.business.web.request.GoodsorderBackDTO;
import com.doumee.dao.business.web.request.GoodsorderCanBanlanceDTO;
+import com.doumee.dao.business.web.response.GoodsorderDetailVO;
import com.doumee.dao.business.web.response.HomeResponse;
import com.doumee.dao.business.web.response.GoodsorderDetailDTO;
import com.doumee.dao.business.web.response.RidesDetailResponse;
@@ -127,9 +129,16 @@
*/
Object createGoodsOrderPay(String memberId);
+ /**
+ * 濂楅璐拱
+ * @param discountId
+ * @param memberId
+ * @return
+ */
+ Object createDiscountOrderPay(String discountId,String memberId);
/**
- * 鎶奸噾鏀粯鍥炶皟涓氬姟
+ * 鏀粯鍥炶皟涓氬姟
* @param preOrderId
* @return
*/
@@ -143,10 +152,15 @@
*/
GoodsorderDetailDTO getGoodsorderDetailDTO(String id);
-
+ Integer getVoltageStatus(Bikes bikes);
+ /**
+ * 濂楅鍗¤鍗曡鎯�
+ * @param id
+ * @return
+ */
+ GoodsorderDetailVO getGoodsorderDetailForDisCount(String id);
/**
* 寮哄埗缁撶畻璁㈠崟
- * @param id
* @return
*/
void closeGoodsorder(Goodsorder order,int type );
@@ -156,7 +170,6 @@
/**
* 閫�娆�
- * @param orderId
*/
void backGoodsorder(GoodsorderBackDTO goodsorderBackDTO);
List<MemberRides> getMemberRidesForClose(String orderid );
@@ -196,4 +209,7 @@
void autoCancelRefunOrder();
+ DiscountMember getUseDiscount(String memberId, Integer driveTime,Integer type);
+
+ void autCancel();
}
--
Gitblit v1.9.3