From a21a8b9b733edd59dbcd3f696d2b69f10c4c3fc9 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Fri, 12 Sep 2025 15:11:24 +0800
Subject: [PATCH] Merge branch 'pxb' into xin
---
oying-system/src/main/java/com/oying/modules/sh/service/OrderService.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/sh/service/OrderService.java b/oying-system/src/main/java/com/oying/modules/sh/service/OrderService.java
index 9b3fdc6..4430bf7 100644
--- a/oying-system/src/main/java/com/oying/modules/sh/service/OrderService.java
+++ b/oying-system/src/main/java/com/oying/modules/sh/service/OrderService.java
@@ -49,6 +49,8 @@
OrderResponse getByOrderNum(String orderNum);
+ Order queryByOrderNum(String orderNum);
+
void operationLog(OrderResponse order, OrderStatusEnum stateEnum,String cardName);
void updatePayStatus(String outTradeNo, PayStateEnum stateEnum, String payInfo, String timeEnd);
@@ -83,7 +85,7 @@
*/
void download(List<Order> all, HttpServletResponse response) throws IOException;
- void closeOrder(String orderNum);
+ void cancel(String orderNum);
void statusOrder(StatusOrder statusOrder);
}
--
Gitblit v1.9.3