From 1c930a8b1ab9abdb851a486b2da55bcda34cd082 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 21 四月 2026 09:20:42 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
---
server/services/src/main/java/com/doumee/service/business/OrdersService.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 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 0a1da27..48daf2e 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
@@ -299,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);
+
+ /**
* 璁＄畻骞舵洿鏂拌鍗曚笁鏂规敹鐩婏紙瀛樹欢闂ㄥ簵/鍙栦欢闂ㄥ簵/鍙告満锛�
* 灏卞湴瀵勫瓨锛氫粎瀛樹欢闂ㄥ簵鏀剁泭
* 寮傚湴瀵勫瓨锛氬瓨浠堕棬搴� + 鍙告満鏀剁泭锛涙湁鍙栦欢闂ㄥ簵鏃跺姞涓婂彇浠堕棬搴楁敹鐩�
@@ -318,10 +327,10 @@
/**
* 闂ㄥ簵鏀粯鎶奸噾锛堝敜璧峰井淇℃敮浠橈級
*
- * @param shopId 闂ㄥ簵涓婚敭
+ * @param memberId 鐢ㄦ埛涓婚敭
* @return 鏀粯鍝嶅簲
*/
- PayResponse payShopDeposit(Integer shopId);
+ PayResponse payShopDeposit(Integer memberId);
/**
* 闂ㄥ簵鎶奸噾鏀粯鍥炶皟澶勭悊
--
Gitblit v1.9.3