From 46f7c2ef3abc235e44c59be9b3c5396befc64888 Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Tue, 15 Jul 2025 18:33:09 +0800
Subject: [PATCH] Merge branch 'xin' into pxb
---
oying-system/src/main/java/com/oying/modules/sh/service/OrderService.java | 6 +++++-
1 files changed, 5 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 4ac0a58..73db9e8 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,10 +11,12 @@
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;
/**
@@ -47,7 +49,7 @@
OrderResponse getByOrderNum(String orderNum);
- void operationLog(OrderResponse order);
+ void operationLog(OrderResponse order, OrderStatusEnum stateEnum);
void updatePayStatus(String outTradeNo, PayStateEnum stateEnum, String payInfo, String timeEnd);
@@ -82,4 +84,6 @@
void download(List<Order> all, HttpServletResponse response) throws IOException;
void closeOrder(String orderNum);
+
+ void statusOrder(StatusOrder statusOrder);
}
--
Gitblit v1.9.3