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/hwc/service/impl/CallbackServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/oying-system/src/main/java/com/oying/modules/hwc/service/impl/CallbackServiceImpl.java b/oying-system/src/main/java/com/oying/modules/hwc/service/impl/CallbackServiceImpl.java
index 6915ba3..d949755 100644
--- a/oying-system/src/main/java/com/oying/modules/hwc/service/impl/CallbackServiceImpl.java
+++ b/oying-system/src/main/java/com/oying/modules/hwc/service/impl/CallbackServiceImpl.java
@@ -62,7 +62,7 @@
                                     PayStateEnum stateEnum = PayStateEnum.NOTPAY;
                                     if ("0".equals(map.get("pay_result"))) {
                                         stateEnum = PayStateEnum.SUCCESS;
-                                        orderService.operationLog(order, OrderStatusEnum.TWO);
+                                        orderService.operationLog(order, OrderStatusEnum.TWO, null);
                                     }
                                     orderService.updatePayStatus(map.get("out_trade_no"), stateEnum, map.get("pay_info"), map.get("time_end"));
                                     // 处理成功

--
Gitblit v1.9.3