From 82f707ece09a906007f3d760b6bb025896e3bba6 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 22 四月 2026 15:39:36 +0800
Subject: [PATCH] 门店

---
 server/services/src/main/java/com/doumee/service/business/OrdersService.java |   23 ++++++++++++-----------
 1 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/server/services/src/main/java/com/doumee/service/business/OrdersService.java b/server/services/src/main/java/com/doumee/service/business/OrdersService.java
index 91ecdf9..3a9df6a 100644
--- a/server/services/src/main/java/com/doumee/service/business/OrdersService.java
+++ b/server/services/src/main/java/com/doumee/service/business/OrdersService.java
@@ -9,15 +9,7 @@
 import com.doumee.dao.dto.DispatchDTO;
 import com.doumee.dao.dto.CommentOrderDTO;
 import com.doumee.dao.dto.MyOrderDTO;
-import com.doumee.dao.vo.MyOrderDetailVO;
-import com.doumee.dao.vo.MyOrderVO;
-import com.doumee.dao.vo.OrderDetailVO;
-import com.doumee.dao.vo.OrderDispatchVO;
-import com.doumee.dao.vo.OrderSummaryVO;
-import com.doumee.dao.vo.OverdueFeeVO;
-import com.doumee.dao.vo.PayResponse;
-import com.doumee.dao.vo.PriceCalculateVO;
-import com.doumee.dao.vo.EstimatedDeliveryResultVO;
+import com.doumee.dao.vo.*;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -327,10 +319,10 @@
     /**
      * 闂ㄥ簵鏀粯鎶奸噾锛堝敜璧峰井淇℃敮浠橈級
      *
-     * @param shopId 闂ㄥ簵涓婚敭
+     * @param memberId 鐢ㄦ埛涓婚敭
      * @return 鏀粯鍝嶅簲
      */
-    PayResponse payShopDeposit(Integer shopId);
+    PayResponse payShopDeposit(Integer memberId);
 
     /**
      * 闂ㄥ簵鎶奸噾鏀粯鍥炶皟澶勭悊
@@ -380,4 +372,13 @@
                                                          Double fromLat, Double fromLng,
                                                          Double toLat, Double toLng);
 
+    /**
+     * 鏌ヨ浼氬憳棣栭〉杩涜涓渶鏂拌鍗曟彁绀�
+     * 鏌ヨstatus in (0,1,2,3,4,5)鐨勮鍗曪紝鎸夊垱寤烘椂闂村�掑簭鍙栫涓�鏉�
+     *
+     * @param memberId 浼氬憳涓婚敭
+     * @return 鏈�鏂拌繘琛屼腑璁㈠崟鎻愮ず锛屾棤璁㈠崟杩斿洖null
+     */
+    ActiveOrderTipVO getActiveOrderTip(Integer memberId);
+
 }
\ No newline at end of file

--
Gitblit v1.9.3