From 0b6dd3676e416943298d8a4833347b358ad534d1 Mon Sep 17 00:00:00 2001 From: bootx Date: Tue, 26 Aug 2025 14:04:40 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=94=AF=E4=BB=98=E7=A0=81=E7=89=8C?= =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=9C=BA=E6=99=AF=E4=B8=8B=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E6=8E=88=E6=9D=83=E8=AE=A4=E8=AF=81=E9=93=BE=E6=8E=A5=E9=94=99?= =?UTF-8?q?=E8=AF=AF/=E6=94=AF=E4=BB=98=E5=AE=9DH5=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E6=88=90=E5=8A=9F=E5=90=8E=E8=B0=83=E8=BD=AC=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E4=B8=8D=E6=AD=A3=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _config/README.md | 15 +++++++++++++++ .../payment/config/AlipayConfigService.java | 2 +- .../service/gateway/CashierCodePayService.java | 2 ++ 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 _config/README.md diff --git a/_config/README.md b/_config/README.md new file mode 100644 index 00000000..3545505c --- /dev/null +++ b/_config/README.md @@ -0,0 +1,15 @@ +# SQL脚本说明 + +## 注意事项 +- MySQL名录下对应的是MySQL的数据库脚本，postgresql下是PGSQL数据库的数据库脚本 +- 项目中不直接提供历史SQL文件，如果需要可以查看项目的git历史版本，其中的SQL文件就是对应的历史版本 +- 全新安装的脚本执行顺序：tables.sql -> datas.sql +- 升级脚本执行顺序：update-tables.sql -> update-datas.sql -> update-update-perm.sql(可选)，提供的更新版本是上一个版本升级到当前版本所对应的SQL文件，不能跨版本升级 +- update-perm.sql是数据权限脚本，如果没有对数据权限进行过修改，执行脚本覆盖原有数据即可，如果修改了数据权限，就不要执行这个脚本，自行处理数据权限即可 + +## 脚本介绍 +- tables.sql：创建表结构(全量) +- datas.sql：表数据(全量) +- update-tables.sql：更新表结构 +- update-datas.sql：更新数据 +- update-perm.sql：数据权限脚本(更新会清除旧数据) diff --git a/daxpay-open-channel/daxpay-open-channel-alipay/src/main/java/org/dromara/daxpay/channel/alipay/service/payment/config/AlipayConfigService.java b/daxpay-open-channel/daxpay-open-channel-alipay/src/main/java/org/dromara/daxpay/channel/alipay/service/payment/config/AlipayConfigService.java index fb0ed048..5e7e6a9b 100644 --- a/daxpay-open-channel/daxpay-open-channel-alipay/src/main/java/org/dromara/daxpay/channel/alipay/service/payment/config/AlipayConfigService.java +++ b/daxpay-open-channel/daxpay-open-channel-alipay/src/main/java/org/dromara/daxpay/channel/alipay/service/payment/config/AlipayConfigService.java @@ -118,7 +118,7 @@ public class AlipayConfigService { public String getReturnUrl(boolean isv) { String url = isv?"{}/unipay/return/{}/{}/alipay/isv":"{}/unipay/return/{}/{}/alipay"; PaymentReqInfoLocal reqInfo = PaymentContextLocal.get().getReqInfo(); - return StrUtil.format(url,reqInfo.getGatewayH5Url(), reqInfo.getMchNo(),reqInfo.getAppId()); + return StrUtil.format(url,reqInfo.getGatewayServiceUrl(), reqInfo.getMchNo(),reqInfo.getAppId()); } /** diff --git a/daxpay-open/daxpay-open-service/src/main/java/org/dromara/daxpay/service/pay/service/gateway/CashierCodePayService.java b/daxpay-open/daxpay-open-service/src/main/java/org/dromara/daxpay/service/pay/service/gateway/CashierCodePayService.java index 93d02b96..9f7e4246 100644 --- a/daxpay-open/daxpay-open-service/src/main/java/org/dromara/daxpay/service/pay/service/gateway/CashierCodePayService.java +++ b/daxpay-open/daxpay-open-service/src/main/java/org/dromara/daxpay/service/pay/service/gateway/CashierCodePayService.java @@ -115,6 +115,8 @@ public class CashierCodePayService { // 查询码牌支付场景配置 var sceneConfig = codeSceneConfigManager.findByConfigAndScene(cashierCode.getConfigId(), param.getCashierScene()) .orElseThrow(() -> new DataNotExistException("码牌支付场景配置不存在")); + // 初始化上下文信息 + paymentAssistService.initMchAndApp(cashierCode.getMchNo(), cashierCode.getAppId()); // 获取认证策略 var channelAuthStrategy = PaymentStrategyFactory.create(sceneConfig.getChannel(), AbsChannelAuthStrategy.class); var cashierCodeType = CashierSceneEnum.findByCode(sceneConfig.getScene());