From b4d3224898d50b8f1e30b5c8083a520743927282 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Mon, 14 Jul 2025 21:08:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xin
---
oying-system/src/main/java/com/oying/modules/sh/service/OrderService.java | 5 +++--
1 files changed, 3 insertions(+), 2 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 1ae08fb..4ac0a58 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
@@ -13,6 +13,7 @@
import com.oying.modules.sh.domain.request.GeneratorOrder;
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.PayStateEnum;
@@ -44,9 +45,9 @@
Order submitOrder(SubmitOrder submit, HttpServletRequest request);
- Order getByOrderNum(String orderNum);
+ OrderResponse getByOrderNum(String orderNum);
- void paySuccess(Order order);
+ void operationLog(OrderResponse order);
void updatePayStatus(String outTradeNo, PayStateEnum stateEnum, String payInfo, String timeEnd);
--
Gitblit v1.9.3