From f2b6fdd955f8ac6e5b351e0b5e3a9f583ed6da2e Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 30 四月 2026 15:26:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 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 935b2a5..d990ee3 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
@@ -149,6 +149,26 @@
     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);
+
+    /**
      * 闂ㄥ簵绔煡璇㈣鍗曡鎯�
      * 鏀寔鎸夎鍗曚富閿垨鏍搁攢鐮佹煡璇紝澶嶇敤浼氬憳绔鎯呴�昏緫
      *
@@ -406,4 +426,9 @@
      */
     int autoCompleteOrders();
 
+    /**
+     * 鎵撳嵃璁㈠崟鏍囩
+     */
+    void printOrderLabel(Integer orderId, Integer shopId);
+
 }
\ No newline at end of file

--
Gitblit v1.9.3