From 0526acc407572d23b1030e0ffd842406ae0bc121 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Wed, 16 Jul 2025 18:20:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pxb' into xin
---
oying-system/src/main/java/com/oying/modules/sh/service/OrderService.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 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 e19d9e9..b2515a3 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
@@ -11,9 +11,13 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.oying.modules.sh.domain.request.GeneratorOrder;
+import com.oying.modules.sh.domain.request.StatusOrder;
import com.oying.modules.sh.domain.request.SubmitOrder;
import com.oying.modules.sh.domain.vo.OrderInfo;
+import com.oying.modules.sh.domain.vo.OrderResponse;
import com.oying.utils.PageResult;
+import com.oying.utils.enums.OrderStatusEnum;
+import com.oying.utils.enums.PayStateEnum;
/**
* @author lixin
@@ -42,6 +46,12 @@
OrderInfo generatorOrder(GeneratorOrder generator);
Order submitOrder(SubmitOrder submit, HttpServletRequest request);
+
+ OrderResponse getByOrderNum(String orderNum);
+
+ void operationLog(OrderResponse order, OrderStatusEnum stateEnum,String cardName);
+
+ void updatePayStatus(String outTradeNo, PayStateEnum stateEnum, String payInfo, String timeEnd);
/**
* 创建
@@ -72,4 +82,8 @@
* @throws IOException /
*/
void download(List<Order> all, HttpServletResponse response) throws IOException;
+
+ void cancel(String orderNum);
+
+ void statusOrder(StatusOrder statusOrder);
}
--
Gitblit v1.9.3