From 000597fb220d754ad8733ea9ac84eddcab10a8e1 Mon Sep 17 00:00:00 2001 From: DaxPay Dev Date: Sun, 5 Jul 2026 18:14:27 +0800 Subject: [PATCH] =?UTF-8?q?fix(payment):=20=E5=90=8C=E6=AD=A5/=E5=85=B3?= =?UTF-8?q?=E9=97=AD=E8=AE=B0=E5=BD=95=E5=95=86=E6=88=B7=E5=8F=B7=E6=98=BE?= =?UTF-8?q?=E5=BC=8F=E8=B5=8B=E5=80=BC,=E4=BF=AE=E5=A4=8D=E9=9D=9EHTTP?= =?UTF-8?q?=E5=9C=BA=E6=99=AF=E4=B8=8A=E4=B8=8B=E6=96=87=E7=BC=BA=E5=A4=B1?= =?UTF-8?q?=E8=87=B4mchNo=E4=B8=BAnull?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../daxpay/open/payment/core/trade/service/PayCloseService.java | 2 ++ .../daxpay/open/payment/core/trade/service/PaySyncService.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/service/PayCloseService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/service/PayCloseService.java index 0b9c2fbab..b42ae791a 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/service/PayCloseService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/service/PayCloseService.java @@ -117,6 +117,8 @@ public class PayCloseService { .setClosed(StrUtil.isBlank(errMsg)) .setCloseType(closeType.getCode()) .setErrorMsg(errMsg); + // 商户号显式赋值, 不依赖线程上下文自动填充(异步通知/定时任务等非HTTP场景上下文缺失会导致填充null) + record.setMchNo(trade.getMchNo()); payCloseRecordService.saveRecord(record); } } diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/service/PaySyncService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/service/PaySyncService.java index 89f4bfe73..75b163a37 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/service/PaySyncService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/service/PaySyncService.java @@ -214,6 +214,8 @@ public class PaySyncService { .setAdjust(adjust) .setErrorCode(syncResult.getSyncErrorCode()) .setErrorMsg(syncResult.getSyncErrorMsg()); + // 商户号显式赋值, 不依赖线程上下文自动填充(异步通知/定时任务等非HTTP场景上下文缺失会导致填充null) + record.setMchNo(trade.getMchNo()); paySyncRecordService.saveRecord(record); } }