From 4ea3b805fe58cfb0dda9fc15a96822470de8404b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <2270033969@qq.com> Date: Sat, 8 Mar 2025 16:19:32 +0800 Subject: [PATCH] =?UTF-8?q?feat(pay):=20=E5=9C=A8=20`YungouosMergePayOrder?= =?UTF-8?q?Handler`=20=E4=B8=AD=E6=8F=90=E5=8F=96=E5=B9=B6=E4=BC=A0?= =?UTF-8?q?=E9=80=92=20`key`=20=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 从支付渠道配置中提取 `key` 参数，并将其传递给 `MergePay.nativePay` 方法，以支持更灵活的支付配置。 --- .../pay/handler/impl/YungouosMergePayOrderHandler.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 1e51cca52..7445f166e 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 @@ -3,6 +3,8 @@ package com.pig4cloud.pigx.pay.handler.impl; import cn.hutool.core.util.NumberUtil; import cn.hutool.extra.servlet.JakartaServletUtil; import cn.hutool.extra.spring.SpringUtil; +import cn.hutool.json.JSONObject; +import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.pig4cloud.pigx.common.data.tenant.TenantContextHolder; import com.pig4cloud.pigx.pay.entity.PayChannel; @@ -93,10 +95,13 @@ public class YungouosMergePayOrderHandler extends AbstractPayOrderHandler { // 判断是否是单体架构 Boolean isMicro = SpringUtil.getProperty("security.micro", Boolean.class, true); + JSONObject params = JSONUtil.parseObj(channel.getParam()); + String key = params.getStr("key"); + return MergePay.nativePay(String.valueOf(tradeOrder.getOrderId()), money, channel.getChannelMchId(), tradeOrder.getBody(), "1", TenantContextHolder.getTenantId().toString(), String.format("%s/api/%s/notify/merge/callbak", ChannelPayApiConfigKit.get().getNotifyUrl(), isMicro ? "pay" : "admin"), - ChannelPayApiConfigKit.get().getReturnUrl(), "", "", "", channel.getParam()); + ChannelPayApiConfigKit.get().getReturnUrl(), "", "", "", key); } /**