From 206f601b1f2a2e3cb0bf4f5dead01bec9077d8e9 Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Thu, 04 Sep 2025 15:28:52 +0800
Subject: [PATCH] Merge branch 'xin' into pxb

---
 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