From d98e92ff3cd9bde1398d4f84a393da9397cb6e70 Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Tue, 15 Jul 2025 19:57:04 +0800
Subject: [PATCH] Merge branch 'xin' into pxb
---
oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
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..39046b3 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,8 +254,8 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void operationLog(OrderResponse order, OrderStatusEnum stateEnum) {
- operationLogService.create(order, stateEnum, null);
+ public void operationLog(OrderResponse order, OrderStatusEnum stateEnum, String cardName) {
+ operationLogService.create(order, stateEnum, cardName);
}
@Override
--
Gitblit v1.9.3