From 2d02eb82474e43faedfe06910381ede0eda67f3c Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期一, 13 十月 2025 09:40:04 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/jinkuai
---
server/services/src/main/java/com/doumee/service/business/OrdersService.java | 23 +++++++++++++++++------
1 files changed, 17 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 0da39ec..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
@@ -52,8 +52,9 @@
*
* @param orders 瀹炰綋瀵硅薄
*/
- void updateById(Orders orders);
+// void updateById(Orders orders);
+ void update(Orders orders);
/**
* 鎵归噺涓婚敭鏇存柊
*
@@ -105,13 +106,19 @@
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);
OrderReleaseVO doneOrder(DoneOrderDTO doneOrderDTO);
@@ -128,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);
@@ -143,4 +150,8 @@
void initializeCode();
OrderReleaseVO reusePay(ReusePayDTO reusePayDTO);
+
+ void confirmFee(ConfirmFeeOrderDTO orders);
+
+ void autoCancelWaitPay();
}
--
Gitblit v1.9.3