From 4384ad3db8f10b7add5f287681c069d4efb1e0ee Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 16 七月 2025 11:54:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/service/business/OrdersService.java | 45 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 44 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..4132624 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,16 @@
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 com.wechat.pay.java.service.refund.model.RefundNotification;
+
import java.util.List;
/**
@@ -18,7 +26,7 @@
* @param orders 瀹炰綋瀵硅薄
* @return Integer
*/
- Integer create(Orders orders);
+ Object create(Orders orders);
/**
* 涓婚敭鍒犻櫎
@@ -94,4 +102,39 @@
* @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);
+
+ PageData<Orders> findPageForMini(PageWrap<Orders> pageWrap);
+
+ Orders getDetail(Integer id,Integer userType);
+
+ void refundCallback(RefundNotification refundNotification);
+
+ void autoComment();
+
+ void autoConfirm();
}
--
Gitblit v1.9.3