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/impl/OrderServiceImpl.java | 4 ++--
oying-system/src/main/java/com/oying/modules/sh/service/OrderService.java | 2 +-
2 files changed, 3 insertions(+), 3 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 73db9e8..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
@@ -49,7 +49,7 @@
OrderResponse getByOrderNum(String orderNum);
- void operationLog(OrderResponse order, OrderStatusEnum stateEnum);
+ void operationLog(OrderResponse order, OrderStatusEnum stateEnum,String cardName);
void updatePayStatus(String outTradeNo, PayStateEnum stateEnum, String payInfo, String timeEnd);
diff --git a/oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderServiceImpl.java b/oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderServiceImpl.java
index 585c84e..7a18e61 100644
--- a/oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderServiceImpl.java
+++ b/oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderServiceImpl.java
@@ -241,7 +241,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void statusOrder(StatusOrder statusOrder) {
- operationLog(getByOrderNum(statusOrder.getOrderNum()), statusOrder.getStatus());
+ operationLog(getByOrderNum(statusOrder.getOrderNum()), statusOrder.getStatus(), null);
}
@Override
@@ -254,7 +254,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void operationLog(OrderResponse order, OrderStatusEnum stateEnum) {
+ public void operationLog(OrderResponse order, OrderStatusEnum stateEnum, String cardName) {
operationLogService.create(order, stateEnum, null);
}
--
Gitblit v1.9.3