From 996b2f16afaa271ce8aad6abf6858aa5db503eb3 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期六, 25 四月 2026 14:07:34 +0800
Subject: [PATCH] 代码生成
---
server/services/src/main/java/com/doumee/service/business/OrdersService.java | 93 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 82 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 58debcd..1695868 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,14 +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.*;
import java.math.BigDecimal;
import java.util.List;
@@ -129,7 +122,7 @@
MyOrderDetailVO findMyOrderDetail(Integer id, Integer memberId);
/**
- * 浼氬憳鍙栨秷璁㈠崟锛堜粎寮傚湴瀵勫瓨锛�
+ * 浼氬憳鍙栨秷璁㈠崟
*
* @param orderId 璁㈠崟涓婚敭
* @param memberId 浼氬憳涓婚敭
@@ -154,6 +147,26 @@
* @param remark 澶囨敞
*/
void shopVerifyOrder(String verifyCode, Integer shopId, List<String> images, String remark);
+
+ /**
+ * 闂ㄥ簵鏍搁攢锛堣嚜鍔ㄨ瘑鍒細鍛樻牳閿�鐮�/鍙告満鏍搁攢鐮侊級
+ *
+ * @param verifyCode 鏍搁攢鐮�
+ * @param shopId 闂ㄥ簵涓婚敭
+ * @param images 鍥剧墖
+ * @param remark 澶囨敞
+ */
+ void verifyOrder(String verifyCode, Integer shopId, List<String> images, String remark);
+
+ /**
+ * 闂ㄥ簵閫氳繃璁㈠崟涓婚敭鏍搁攢
+ *
+ * @param orderId 璁㈠崟涓婚敭
+ * @param shopId 闂ㄥ簵涓婚敭
+ * @param images 鍥剧墖
+ * @param remark 澶囨敞
+ */
+ void verifyOrderByShopId(Integer orderId, Integer shopId, List<String> images, String remark);
/**
* 闂ㄥ簵绔煡璇㈣鍗曡鎯�
@@ -298,6 +311,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);
+
+ /**
* 璁＄畻骞舵洿鏂拌鍗曚笁鏂规敹鐩婏紙瀛樹欢闂ㄥ簵/鍙栦欢闂ㄥ簵/鍙告満锛�
* 灏卞湴瀵勫瓨锛氫粎瀛樹欢闂ㄥ簵鏀剁泭
* 寮傚湴瀵勫瓨锛氬瓨浠堕棬搴� + 鍙告満鏀剁泭锛涙湁鍙栦欢闂ㄥ簵鏃跺姞涓婂彇浠堕棬搴楁敹鐩�
@@ -317,10 +339,10 @@
/**
* 闂ㄥ簵鏀粯鎶奸噾锛堝敜璧峰井淇℃敮浠橈級
*
- * @param shopId 闂ㄥ簵涓婚敭
+ * @param memberId 鐢ㄦ埛涓婚敭
* @return 鏀粯鍝嶅簲
*/
- PayResponse payShopDeposit(Integer shopId);
+ PayResponse payShopDeposit(Integer memberId);
/**
* 闂ㄥ簵鎶奸噾鏀粯鍥炶皟澶勭悊
@@ -355,4 +377,53 @@
*/
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);
+
+ /**
+ * 鏌ヨ浼氬憳棣栭〉杩涜涓渶鏂拌鍗曟彁绀�
+ * 鏌ヨstatus in (0,1,2,3,4,5)鐨勮鍗曪紝鎸夊垱寤烘椂闂村�掑簭鍙栫涓�鏉�
+ *
+ * @param memberId 浼氬憳涓婚敭
+ * @return 鏈�鏂拌繘琛屼腑璁㈠崟鎻愮ず锛屾棤璁㈠崟杩斿洖null
+ */
+ ActiveOrderTipVO getActiveOrderTip(Integer memberId);
+
+ /**
+ * 鍙栨秷瓒呮椂鏈敮浠樿鍗�
+ * 鏍规嵁杩愯惀閰嶇疆 AUTO_CANCEL_TIME锛堝垎閽燂級锛屽皢鍒涘缓鏃堕棿瓒呰繃璇ュ�间笖浠嶄负寰呮敮浠樼殑璁㈠崟鎵归噺鍙栨秷
+ *
+ * @return 鍙栨秷鐨勮鍗曟暟閲�
+ */
+ int cancelTimeoutUnpaidOrders();
+
+ /**
+ * 閫氱煡骞冲彴浜哄憳锛氬凡瀵勫瓨璁㈠崟瓒呮椂鏃犱汉鎶㈠崟
+ * 鏍规嵁杩愯惀閰嶇疆 NO_GRAB_NOTIFY_TIME锛堝垎閽燂級锛屾壂鎻忓紓鍦板凡瀵勫瓨(status=2)涓旇秴鏃剁殑璁㈠崟锛�
+ * 缁欓厤缃殑閫氱煡浜哄憳鍙戦�佺煭淇★紙PLATFORM_WAIT_GRAB锛夛紝骞舵爣璁板凡閫氱煡闃叉閲嶅
+ *
+ * @return 閫氱煡鐨勮鍗曟暟閲�
+ */
+ int notifyUngrabbedOrders();
+
+ /**
+ * 鑷姩瀹屾垚瓒呮椂鏈‘璁ょ殑璁㈠崟
+ * 鏍规嵁杩愯惀閰嶇疆 AUTO_CONFIRM_RECEIPT锛堝ぉ锛夛紝灏嗗凡閫佽揪(status=5)瓒呰繃璇ュぉ鏁扮殑璁㈠崟鑷姩鏍囪涓哄凡瀹屾垚
+ *
+ * @return 鑷姩瀹屾垚鐨勮鍗曟暟閲�
+ */
+ int autoCompleteOrders();
+
}
\ No newline at end of file
--
Gitblit v1.9.3