From c4bd6e7e1fadfac44466d589ee4d5dfcf77c2a59 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 15 七月 2025 09:26:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/services/src/main/java/com/doumee/service/business/OrdersService.java |   34 +++++++++++++++++++++++++++++++++-
 1 files changed, 33 insertions(+), 1 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 9aac0f9..c690a4c 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
@@ -1,8 +1,15 @@
 package com.doumee.service.business;
 
+import com.doumee.core.model.LoginUserInfo;
 import com.doumee.core.model.PageData;
 import com.doumee.core.model.PageWrap;
+import com.doumee.dao.business.model.Member;
 import com.doumee.dao.business.model.Orders;
+import com.doumee.dao.dto.CommentDTO;
+import com.doumee.dao.dto.ConfirmUpdOrderDTO;
+import com.doumee.dao.dto.DoneOrderDTO;
+import com.doumee.dao.dto.UpdOrderDataDTO;
+
 import java.util.List;
 
 /**
@@ -18,7 +25,7 @@
      * @param orders 瀹炰綋瀵硅薄
      * @return Integer
      */
-    Integer create(Orders orders);
+    Object create(Orders orders);
 
     /**
      * 涓婚敭鍒犻櫎
@@ -94,4 +101,29 @@
      * @return long
      */
     long count(Orders orders);
+
+    void accept(Integer orderId, Member member);
+
+    void begin(Integer orderId,Member member);
+
+    void updOrderData(UpdOrderDataDTO updOrderDataDTO);
+
+    void confirmUpd(ConfirmUpdOrderDTO confirmUpdOrderDTO);
+
+    void releaseCancelOrder(Integer orderId,Member member);
+
+    void receiveCancelOrder(Integer orderId,Member member);
+
+    Object doneOrder(DoneOrderDTO doneOrderDTO);
+
+    void comment(CommentDTO commentDTO);
+
+    /**
+     * 鏀粯鍥炶皟涓氬姟
+     * @param preOrderId
+     * @return
+     */
+    String payNotify(String preOrderId,String paymentNo);
+
+    void platformCancel(Integer orderId, LoginUserInfo loginUserInfo);
 }

--
Gitblit v1.9.3