From e995152347bd980bb48806132ae6be1ffee90a64 Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Tue, 15 Jul 2025 18:50:51 +0800
Subject: [PATCH] Merge branch 'xin' into pxb
---
oying-system/src/main/java/com/oying/modules/sh/service/OrderService.java | 17 ++++++++++++++++-
1 files changed, 16 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 4ec21e7..9b3fdc6 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
@@ -5,14 +5,19 @@
import java.util.List;
import java.io.IOException;
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
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
@@ -40,7 +45,13 @@
OrderInfo generatorOrder(GeneratorOrder generator);
- Order submitOrder(SubmitOrder submit);
+ 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);
/**
* 创建
@@ -71,4 +82,8 @@
* @throws IOException /
*/
void download(List<Order> all, HttpServletResponse response) throws IOException;
+
+ void closeOrder(String orderNum);
+
+ void statusOrder(StatusOrder statusOrder);
}
--
Gitblit v1.9.3