From f93f455134ff234be9d257c0f432c8052f1c32cd Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 18 七月 2025 19:20:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/service/business/OrdersService.java | 29 +++++++++++++++++++++++------
1 files changed, 23 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 c690a4c..0da39ec 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
@@ -5,10 +5,9 @@
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.doumee.dao.dto.*;
+import com.doumee.dao.vo.OrderReleaseVO;
+import com.wechat.pay.java.service.refund.model.RefundNotification;
import java.util.List;
@@ -25,7 +24,7 @@
* @param orders 瀹炰綋瀵硅薄
* @return Integer
*/
- Object create(Orders orders);
+ OrderReleaseVO create(Orders orders);
/**
* 涓婚敭鍒犻櫎
@@ -114,7 +113,7 @@
void receiveCancelOrder(Integer orderId,Member member);
- Object doneOrder(DoneOrderDTO doneOrderDTO);
+ OrderReleaseVO doneOrder(DoneOrderDTO doneOrderDTO);
void comment(CommentDTO commentDTO);
@@ -126,4 +125,22 @@
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();
+
+ Long getTotal(Orders orders);
+
+ void autoGrabOrders();
+
+ void initializeCode();
+
+ OrderReleaseVO reusePay(ReusePayDTO reusePayDTO);
}
--
Gitblit v1.9.3