From c9f0611f690b3fb0cb120f5b6799f94977d3f129 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 20 四月 2026 11:34:23 +0800
Subject: [PATCH] 代码生成

---
 server/services/src/main/java/com/doumee/service/business/OrdersService.java |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 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 58debcd..91ecdf9 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
@@ -17,6 +17,7 @@
 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 java.math.BigDecimal;
 import java.util.List;
@@ -298,6 +299,15 @@
     void confirmStoreOut(Integer orderId, Integer shopId, List<String> images, String remark);
 
     /**
+     * 浼氬憳纭鏀惰揣
+     * 寮傚湴瀵勫瓨涓旀棤鍙栦欢闂ㄥ簵鐨勮鍗曪紝閫佽揪鍚�(status=5)锛屼細鍛樼‘璁ゆ敹璐ф爣璁拌鍗曞畬鎴�
+     *
+     * @param orderId  璁㈠崟涓婚敭
+     * @param memberId 褰撳墠鐧诲綍浼氬憳ID
+     */
+    void memberConfirmReceipt(Integer orderId, Integer memberId);
+
+    /**
      * 璁$畻骞舵洿鏂拌鍗曚笁鏂规敹鐩婏紙瀛樹欢闂ㄥ簵/鍙栦欢闂ㄥ簵/鍙告満锛�
      * 灏卞湴瀵勫瓨锛氫粎瀛樹欢闂ㄥ簵鏀剁泭
      * 寮傚湴瀵勫瓨锛氬瓨浠堕棬搴� + 鍙告満鏀剁泭锛涙湁鍙栦欢闂ㄥ簵鏃跺姞涓婂彇浠堕棬搴楁敹鐩�
@@ -355,4 +365,19 @@
      */
     PageData<MyOrderVO> findShopOrderPage(PageWrap<MyOrderDTO> pageWrap, Integer shopId);
 
+    /**
+     * 璁$畻涓ゅ湴涔嬮棿鐨勯璁¢�佽揪鏃舵晥锛堟爣閫熻揪 + 鏋侀�熻揪锛�
+     * 閫氳繃鑵捐鍦板浘API璁$畻瀹為檯璺濈锛屽啀鏍规嵁pricing_rule type=2璁$畻鏃舵晥
+     *
+     * @param cityId    鍩庡競涓婚敭
+     * @param fromLat   璧风偣绾害
+     * @param fromLng   璧风偣缁忓害
+     * @param toLat     缁堢偣绾害
+     * @param toLng     缁堢偣缁忓害
+     * @return 棰勮閫佽揪鏃舵晥缁撴灉
+     */
+    EstimatedDeliveryResultVO calculateEstimatedDelivery(Integer cityId,
+                                                         Double fromLat, Double fromLng,
+                                                         Double toLat, Double toLng);
+
 }
\ No newline at end of file

--
Gitblit v1.9.3