From 82735e4d46ac7b9969facef2acc8f8e793b68f71 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 15 九月 2025 16:11:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/service/business/OrdersService.java | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 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 283b40f..f2695ea 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,7 @@
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;
@@ -55,8 +52,9 @@
*
* @param orders 瀹炰綋瀵硅薄
*/
- void updateById(Orders orders);
+// void updateById(Orders orders);
+ void update(Orders orders);
/**
* 鎵归噺涓婚敭鏇存柊
*
@@ -108,15 +106,21 @@
void begin(Integer orderId,Member member);
- void updOrderData(UpdOrderDataDTO updOrderDataDTO);
-
+// void updOrderData(UpdOrderDataDTO updOrderDataDTO);
+//
void confirmUpd(ConfirmUpdOrderDTO confirmUpdOrderDTO);
- void releaseCancelOrder(Integer orderId,Member member);
+ /**
+ * 璁㈠崟鍙栨秷鍓嶇疆鎻愮ず
+ * @param orderId
+ * @param member
+ * @return
+ */
+ String cancelTips(Integer orderId,Member member);
- void receiveCancelOrder(Integer orderId,Member member);
+ void cancelOrder(Integer orderId,Member member);
- Object doneOrder(DoneOrderDTO doneOrderDTO);
+ OrderReleaseVO doneOrder(DoneOrderDTO doneOrderDTO);
void comment(CommentDTO commentDTO);
@@ -131,7 +135,7 @@
PageData<Orders> findPageForMini(PageWrap<Orders> pageWrap);
- Orders getDetail(Integer id,Integer userType);
+ Orders getDetail(Integer id,Member member);
void refundCallback(RefundNotification refundNotification);
@@ -144,4 +148,10 @@
void autoGrabOrders();
void initializeCode();
+
+ OrderReleaseVO reusePay(ReusePayDTO reusePayDTO);
+
+ void confirmFee(ConfirmFeeOrderDTO orders);
+
+ void autoCancelWaitPay();
}
--
Gitblit v1.9.3