From d52e728dc411aa8e43d37bda9f85bfc09871c1a0 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期六, 19 七月 2025 16:14:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/service/business/OrdersService.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 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 0da39ec..0b0e568 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
@@ -52,8 +52,9 @@
*
* @param orders 瀹炰綋瀵硅薄
*/
- void updateById(Orders orders);
+// void updateById(Orders orders);
+ void update(Orders orders);
/**
* 鎵归噺涓婚敭鏇存柊
*
@@ -105,13 +106,11 @@
void begin(Integer orderId,Member member);
- void updOrderData(UpdOrderDataDTO updOrderDataDTO);
-
+// void updOrderData(UpdOrderDataDTO updOrderDataDTO);
+//
void confirmUpd(ConfirmUpdOrderDTO confirmUpdOrderDTO);
- void releaseCancelOrder(Integer orderId,Member member);
-
- void receiveCancelOrder(Integer orderId,Member member);
+ void cancelOrder(Integer orderId,Member member);
OrderReleaseVO doneOrder(DoneOrderDTO doneOrderDTO);
@@ -128,7 +127,7 @@
PageData<Orders> findPageForMini(PageWrap<Orders> pageWrap);
- Orders getDetail(Integer id,Integer userType);
+ Orders getDetail(Integer id,Member member);
void refundCallback(RefundNotification refundNotification);
--
Gitblit v1.9.3