From 55642c818f14bf8cf52c98e6858014bd8dc3d3a7 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 16 四月 2026 20:10:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/service/business/OrdersService.java | 107 ++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 101 insertions(+), 6 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 cb9f676..58debcd 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
@@ -7,6 +7,7 @@
import com.doumee.dao.dto.CalculateRemotePriceDTO;
import com.doumee.dao.dto.CreateOrderDTO;
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;
@@ -130,9 +131,9 @@
/**
* 浼氬憳鍙栨秷璁㈠崟锛堜粎寮傚湴瀵勫瓨锛�
*
- * @param orderId 璁㈠崟涓婚敭
- * @param memberId 浼氬憳涓婚敭
- * @param reason 鍙栨秷鍘熷洜
+ * @param orderId 璁㈠崟涓婚敭
+ * @param memberId 浼氬憳涓婚敭
+ * @param reason 鍙栨秷鍘熷洜
*/
void cancelOrder(Integer orderId, Integer memberId, String reason);
@@ -189,6 +190,7 @@
/**
* 璁＄畻淇濅环璐圭敤
+ *
* @param declaredValue 鎶ヤ环閲戦
* @return 淇濅环璐圭敤
*/
@@ -196,6 +198,7 @@
/**
* 璁＄畻灏卞湴瀛樺彇棰勪及璐圭敤
+ *
* @param dto 灏卞湴瀛樺彇璁′环璇锋眰鍙傛暟
* @return 浠锋牸璁＄畻缁撴灉
*/
@@ -203,6 +206,7 @@
/**
* 璁＄畻寮傚湴瀛樺彇棰勪及璐圭敤
+ *
* @param dto 寮傚湴瀛樺彇璁′环璇锋眰鍙傛暟
* @return 浠锋牸璁＄畻缁撴灉
*/
@@ -210,7 +214,8 @@
/**
* 鍒涘缓璁㈠崟骞跺敜璧峰井淇℃敮浠�
- * @param dto 鍒涘缓璁㈠崟璇锋眰鍙傛暟
+ *
+ * @param dto 鍒涘缓璁㈠崟璇锋眰鍙傛暟
* @param memberId 褰撳墠鐧诲綍浼氬憳ID
* @return 鏀粯鍝嶅簲
*/
@@ -218,7 +223,8 @@
/**
* 缁х画鏀粯锛堝緟鏀粯璁㈠崟閲嶆柊鍞よ捣寰俊鏀粯锛�
- * @param orderId 璁㈠崟涓婚敭
+ *
+ * @param orderId 璁㈠崟涓婚敭
* @param memberId 褰撳墠鐧诲綍浼氬憳ID
* @return 鏀粯鍝嶅簲
*/
@@ -226,6 +232,7 @@
/**
* 灏忕▼搴忕-鏌ヨ鎴戠殑璁㈠崟鍒嗛〉
+ *
* @param pageWrap 鍒嗛〉鏌ヨ鍙傛暟锛坢odel鍚玸tatus锛�
* @param memberId 浼氬憳涓婚敭
* @return 鍒嗛〉缁撴灉
@@ -234,6 +241,7 @@
/**
* 鏌ヨ璁㈠崟瓒呮椂璐圭敤
+ *
* @param orderId 璁㈠崟涓婚敭
* @return 瓒呮椂璐圭敤璁＄畻缁撴灉
*/
@@ -260,4 +268,91 @@
*/
void confirmCustomerArrived(Integer orderId, Integer shopId);
-}
+ /**
+ * 閫炬湡璐圭敤鏀粯锛堝敜璧峰井淇℃敮浠橈級
+ *
+ * @param orderId 瀵勫瓨璁㈠崟涓婚敭
+ * @param memberId 褰撳墠鐧诲綍浼氬憳ID
+ * @return 鏀粯鍝嶅簲
+ */
+ PayResponse payOverdueFee(Integer orderId, Integer memberId);
+
+ /**
+ * 閫炬湡璐圭敤鏀粯鍥炶皟澶勭悊
+ *
+ * @param outTradeNo 鍟嗘埛璁㈠崟鍙�
+ * @param wxTradeNo 寰俊璁㈠崟鍙�
+ */
+ void handleOverdueFeePayNotify(String outTradeNo, String wxTradeNo);
+
+ /**
+ * 鍙栦欢闂ㄥ簵纭鍑哄簱
+ * 灏卞湴瀵勫瓨/寮傚湴瀵勫瓨锛屽瓨鍦ㄥ彇浠堕棬搴楋紝status=5锛宱verdueStatus=0/2锛宑onfirmArriveTime涓嶄负绌�
+ * 鍑哄簱鍚庤鍗曞畬鎴�
+ *
+ * @param orderId 璁㈠崟涓婚敭
+ * @param shopId 褰撳墠鎿嶄綔闂ㄥ簵涓婚敭
+ * @param images 鍑哄簱鍥剧墖锛堟渶澶�3寮狅級
+ * @param remark 鍑哄簱澶囨敞
+ */
+ void confirmStoreOut(Integer orderId, Integer shopId, List<String> images, String remark);
+
+ /**
+ * 璁＄畻骞舵洿鏂拌鍗曚笁鏂规敹鐩婏紙瀛樹欢闂ㄥ簵/鍙栦欢闂ㄥ簵/鍙告満锛�
+ * 灏卞湴瀵勫瓨锛氫粎瀛樹欢闂ㄥ簵鏀剁泭
+ * 寮傚湴瀵勫瓨锛氬瓨浠堕棬搴� + 鍙告満鏀剁泭锛涙湁鍙栦欢闂ㄥ簵鏃跺姞涓婂彇浠堕棬搴楁敹鐩�
+ *
+ * @param orderId 璁㈠崟涓婚敭
+ */
+ void calculateAndSaveOrderFees(Integer orderId);
+
+ /**
+ * 浼氬憳鍒犻櫎璁㈠崟锛堥�昏緫鍒犻櫎锛屼粎宸插畬鎴�/宸插彇娑�/宸查��娆捐鍗曞彲鍒犻櫎锛�
+ *
+ * @param orderId 璁㈠崟涓婚敭
+ * @param memberId 浼氬憳涓婚敭
+ */
+ void deleteMyOrder(Integer orderId, Integer memberId);
+
+ /**
+ * 闂ㄥ簵鏀粯鎶奸噾锛堝敜璧峰井淇℃敮浠橈級
+ *
+ * @param shopId 闂ㄥ簵涓婚敭
+ * @return 鏀粯鍝嶅簲
+ */
+ PayResponse payShopDeposit(Integer shopId);
+
+ /**
+ * 闂ㄥ簵鎶奸噾鏀粯鍥炶皟澶勭悊
+ *
+ * @param outTradeNo 鍟嗘埛璁㈠崟鍙�
+ * @param wxTradeNo 寰俊璁㈠崟鍙�
+ */
+ void handleShopDepositPayNotify(String outTradeNo, String wxTradeNo);
+
+ /**
+ * 璁㈠崟缁撶畻锛氭牴鎹� SETTLEMENT_DATE 閰嶇疆锛屽皢宸插畬鎴愮殑寰呯粨绠楄鍗曡繘琛岀粨绠�
+ * 鏇存柊璁㈠崟缁撶畻鐘舵�併�丷evenue 鍏ヨ处鐘舵�併�侀棬搴�/鍙告満浣欓
+ */
+ void settleOrders();
+
+ /**
+ * 璁㈠崟璇勪环
+ * status=7涓攃ommentStatus=0鏃跺彲璇勪环锛屾寜瀵硅薄锛堝瓨浠堕棬搴�/鍙栦欢闂ㄥ簵/鍙告満锛夊垎鍒褰曡瘎鍒�
+ *
+ * @param dto 璇勪环璇锋眰
+ * @param memberId 褰撳墠鐧诲綍浼氬憳ID
+ */
+ void commentOrder(CommentOrderDTO dto, Integer memberId);
+
+ /**
+ * 闂ㄥ簵绔鍗曞垎椤靛垪琛�
+ * 鏌ヨ瀛樹欢闂ㄥ簵鎴栧彇浠堕棬搴楃瓑浜庡綋鍓嶇櫥褰曢棬搴楃殑璁㈠崟
+ *
+ * @param pageWrap 鍒嗛〉鏌ヨ鍙傛暟锛坢odel鍚玸tatus/combinedStatus锛�
+ * @param shopId 褰撳墠鐧诲綍闂ㄥ簵涓婚敭
+ * @return 鍒嗛〉缁撴灉
+ */
+ PageData<MyOrderVO> findShopOrderPage(PageWrap<MyOrderDTO> pageWrap, Integer shopId);
+
+}
\ No newline at end of file
--
Gitblit v1.9.3