mirror of
http://git.pig4cloud.com/pig/pigx.git
synced 2026-11-11 21:29:02 +08:00
feat(pay): 升级yungouos-pay-sdk版本并优化依赖配置
- 将yungouos-pay-sdk版本从2.0.37升级至2.0.39 - 排除hutool-all依赖以避免与系统已有依赖冲突 - 在YungouosMergePayOrderHandler中新增pay参数配置
This commit is contained in:
1 parent
77ebb4fe37
commit
bfd64bbd47
2 files changed
+9
-2
No files matched your search
@@ -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>
|
||||
|
||||
+1
-1
@@ -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);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in new issue
Block a user