From bfd64bbd478b043d4594a863a32b5405858dc540 Mon Sep 17 00:00:00 2001
From: PIGCLOUD <wangiegie@gmail.com>
Date: Fri, 19 Dec 2025 17:29:10 +0800
Subject: [PATCH] =?UTF-8?q?feat(pay):=20=E5=8D=87=E7=BA=A7yungouos-pay-sdk?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=B9=B6=E4=BC=98=E5=8C=96=E4=BE=9D=E8=B5=96?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将yungouos-pay-sdk版本从2.0.37升级至2.0.39
- 排除hutool-all依赖以避免与系统已有依赖冲突
- 在YungouosMergePayOrderHandler中新增pay参数配置
---
 pigx-visual/pigx-pay-platform/pom.xml                    | 9 ++++++++-
 .../pay/handler/impl/YungouosMergePayOrderHandler.java   | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/pigx-visual/pigx-pay-platform/pom.xml b/pigx-visual/pigx-pay-platform/pom.xml
index a7c0b0f22..2067dd067 100755
--- a/pigx-visual/pigx-pay-platform/pom.xml
+++ b/pigx-visual/pigx-pay-platform/pom.xml
@@ -14,7 +14,7 @@
 
     <description>支付系统</description>
     <properties>
-        <yungouos.version>2.0.37</yungouos.version>
+        <yungouos.version>2.0.39</yungouos.version>
     </properties>
 
     <dependencies>
@@ -113,6 +113,13 @@
             <groupId>com.yungouos.pay</groupId>
             <artifactId>yungouos-pay-sdk</artifactId>
             <version>${yungouos.version}</version>
+            <exclusions>
+                <!-- 屏蔽hutool 避免和系统引入的冲突 -->
+                <exclusion>
+                    <artifactId>hutool-all</artifactId>
+                    <groupId>cn.hutool</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!--web 模块-->
         <dependency>
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 b5f066a58..23d3cdc63 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
@@ -100,7 +100,7 @@ public class YungouosMergePayOrderHandler extends AbstractPayOrderHandler {
         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(), WebUtils.isMicro() ? "pay" : "admin"),
-                ChannelPayApiConfigKit.get().getReturnUrl(), "", "", "", null, key);
+                ChannelPayApiConfigKit.get().getReturnUrl(), "", "", "0", "pay", null, key);
     }
 
     /**