From dda210e91a09df5af9e564dc7b5d853e98e4ba82 Mon Sep 17 00:00:00 2001 From: PIGCLOUD Date: Fri, 12 Jun 2026 15:41:11 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20YungouosMergePayOrd?= =?UTF-8?q?erHandler=20=E4=B8=AD=E7=9A=84=E5=8F=82=E6=95=B0=E4=BC=A0?= =?UTF-8?q?=E9=80=92=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pigx/pay/handler/impl/YungouosMergePayOrderHandler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/YungouosMergePayOrderHandler.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/YungouosMergePayOrderHandler.java index 018e2b99d..45a0d1e1a 100644 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/YungouosMergePayOrderHandler.java +++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/YungouosMergePayOrderHandler.java @@ -98,9 +98,9 @@ public class YungouosMergePayOrderHandler extends AbstractPayOrderHandler { String key = params.getStr("key"); return MergePay.nativePay(String.valueOf(tradeOrder.getOrderId()), money, channel.getChannelMchId(), - tradeOrder.getBody(), "1", TenantContextHolder.getTenantId().toString(), + tradeOrder.getBody(), "1", null, TenantContextHolder.getTenantId().toString(), String.format("%s/api/%s/notify/merge/callbak", ChannelPayApiConfigKit.get().getNotifyUrl(), WebUtils.isMicro() ? "pay" : "admin"), - ChannelPayApiConfigKit.get().getReturnUrl(), "", "", "0", null, null, key); + ChannelPayApiConfigKit.get().getReturnUrl(), "", "0", null, null, key); } /**