From 18cf2f252338e52fb531cd2ca1cc49e39bf6efe0 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 19 二月 2025 18:50:50 +0800
Subject: [PATCH] 111

---
 server/services/src/main/java/com/doumee/service/business/GoodsorderService.java |   20 ++++++++++++++++----
 1 files changed, 16 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..ff655b5 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
@@ -12,6 +12,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 +128,16 @@
      */
     Object createGoodsOrderPay(String memberId);
 
+    /**
+     * 濂楅璐拱
+     * @param discountId
+     * @param memberId
+     * @return
+     */
+    Object createDiscountOrderPay(String discountId,String memberId);
 
     /**
-     * 鎶奸噾鏀粯鍥炶皟涓氬姟
+     * 鏀粯鍥炶皟涓氬姟
      * @param preOrderId
      * @return
      */
@@ -143,10 +151,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 +169,6 @@
 
     /**
      * 閫�娆�
-     * @param orderId
      */
     void backGoodsorder(GoodsorderBackDTO goodsorderBackDTO);
     List<MemberRides> getMemberRidesForClose(String orderid );

--
Gitblit v1.9.3