From c74a6f59490cfb9a0ee37f70427739b74e7fbd58 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 20 五月 2026 08:50:29 +0800
Subject: [PATCH] 代码生成
---
server/services/src/main/java/com/doumee/service/business/OrdersService.java | 106 ++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 96 insertions(+), 10 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 48daf2e..ffff06d 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
@@ -3,21 +3,16 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Orders;
+import com.doumee.dao.business.model.OrdersRefund;
import com.doumee.dao.dto.CalculateLocalPriceDTO;
import com.doumee.dao.dto.CalculateRemotePriceDTO;
import com.doumee.dao.dto.CreateOrderDTO;
+import com.doumee.dao.dto.HandleOrderExceptionDTO;
+import com.doumee.dao.dto.ManualRefundDTO;
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;
@@ -130,7 +125,7 @@
MyOrderDetailVO findMyOrderDetail(Integer id, Integer memberId);
/**
- * 浼氬憳鍙栨秷璁㈠崟锛堜粎寮傚湴瀵勫瓨锛�
+ * 浼氬憳鍙栨秷璁㈠崟
*
* @param orderId 璁㈠崟涓婚敭
* @param memberId 浼氬憳涓婚敭
@@ -155,6 +150,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);
/**
* 闂ㄥ簵绔煡璇㈣鍗曡鎯�
@@ -347,6 +362,16 @@
void settleOrders();
/**
+ * 鎵嬪姩閫�娆�
+ */
+ void manualRefund(ManualRefundDTO dto, Integer userId);
+
+ /**
+ * 澶勭悊鎵嬪姩閫�娆剧殑鎵ｆ閫昏緫锛堥��娆惧洖璋冩垚鍔熸椂璋冪敤锛�
+ */
+ void processManualRefundCallback(OrdersRefund refundRecord);
+
+ /**
* 璁㈠崟璇勪环
* status=7涓攃ommentStatus=0鏃跺彲璇勪环锛屾寜瀵硅薄锛堝瓨浠堕棬搴�/鍙栦欢闂ㄥ簵/鍙告満锛夊垎鍒褰曡瘎鍒�
*
@@ -380,4 +405,65 @@
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();
+
+ /**
+ * 鎵撳嵃璁㈠崟鏍囩
+ */
+ void printOrderLabel(Integer orderId, Integer shopId);
+
+ /**
+ * 鍗冲皢鍒拌揪鍙栦欢鏃堕棿閫氱煡
+ * @return 閫氱煡鏁伴噺
+ */
+ int notifyArrivalPickUp();
+
+ /**
+ * 璁㈠崟寮傚父澶勭悊锛氬紓鍦版棤鍙栦欢闂ㄥ簵宸查�佽揪璁㈠崟锛屽垱寤哄氨鍦板瓨鍙栨柊璁㈠崟
+ */
+ void handleOrderException(HandleOrderExceptionDTO dto);
+
+ /**
+ * 鏍￠獙鎿嶄綔鍗婂緞
+ * @param orderId 璁㈠崟涓婚敭
+ * @param userId 鎿嶄綔鐢ㄦ埛涓婚敭
+ * @param userType 鐢ㄦ埛绫诲瀷锛�0=闂ㄥ簵锛�1=鍙告満
+ * @param lng 鎿嶄綔浜虹粡搴�
+ * @param lat 鎿嶄綔浜虹含搴�
+ * @return true=鍦ㄥ厑璁告搷浣滆寖鍥村唴锛沠alse=瓒呭嚭鍏佽鎿嶄綔鑼冨洿
+ */
+ Boolean checkOperationRadius(Integer orderId, Integer userId, Integer userType, Double lng, Double lat);
+
}
\ No newline at end of file
--
Gitblit v1.9.3