From a23a10abd77d97491a9f1a61e64118a5c7e65938 Mon Sep 17 00:00:00 2001 From: DaxPay Dev Date: Tue, 14 Jul 2026 11:56:53 +0800 Subject: [PATCH] =?UTF-8?q?refactor(context):=20=E5=B0=86=20MerchantContex?= =?UTF-8?q?tLoader=20=E8=BF=81=E5=85=A5=20common.context?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 与 PaymentContext/Filter/TradeActor 同属线程身份装载层，移除空 assist 包。 --- .../callback/AdapayCallbackController.java | 2 +- .../callback/AlipayCallbackController.java | 2 +- .../callback/DougongCallbackController.java | 2 +- .../callback/DouyinCallbackController.java | 2 +- .../callback/FuyouCallbackController.java | 2 +- .../callback/HkrtCallbackController.java | 2 +- .../callback/HmpayCallbackController.java | 2 +- .../callback/LakalaCallbackController.java | 2 +- .../callback/LeshuaCallbackController.java | 2 +- .../callback/UmsCallbackController.java | 2 +- .../callback/VbillCallbackController.java | 2 +- .../callback/WechatCallbackController.java | 2 +- .../callback/YeepayCallbackController.java | 2 +- .../device/DeviceQrCodeAdminService.java | 2 +- .../open/payment/auth/ChannelAuthService.java | 2 +- .../MerchantContextLoader.java | 18 ++++++++---------- .../runtime/service/pay/NormalPayService.java | 2 +- .../unipay/aop/PaymentVerifyAspect.java | 2 +- .../service/GatewayOrderQueryService.java | 2 +- .../service/GatewayPayAssistService.java | 2 +- .../service/GatewayPayHandleService.java | 2 +- 21 files changed, 28 insertions(+), 30 deletions(-) rename daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/{assist => context}/MerchantContextLoader.java (89%) diff --git a/daxpay-channel/daxpay-channel-adapay/src/main/java/cn/daxpay/open/channel/adapay/controller/callback/AdapayCallbackController.java b/daxpay-channel/daxpay-channel-adapay/src/main/java/cn/daxpay/open/channel/adapay/controller/callback/AdapayCallbackController.java index 278b2d770..9d5350a87 100644 --- a/daxpay-channel/daxpay-channel-adapay/src/main/java/cn/daxpay/open/channel/adapay/controller/callback/AdapayCallbackController.java +++ b/daxpay-channel/daxpay-channel-adapay/src/main/java/cn/daxpay/open/channel/adapay/controller/callback/AdapayCallbackController.java @@ -2,7 +2,7 @@ package cn.daxpay.open.channel.adapay.controller.callback; import cn.daxpay.open.channel.adapay.service.callback.AdapayPayCallbackService; import cn.daxpay.open.channel.adapay.service.callback.AdapayRefundCallbackService; -import cn.daxpay.open.payment.common.assist.MerchantContextLoader; +import cn.daxpay.open.payment.common.context.MerchantContextLoader; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletRequest; diff --git a/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/controller/callback/AlipayCallbackController.java b/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/controller/callback/AlipayCallbackController.java index d3377f9ec..3aef6ecf4 100644 --- a/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/controller/callback/AlipayCallbackController.java +++ b/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/controller/callback/AlipayCallbackController.java @@ -1,7 +1,7 @@ package cn.daxpay.open.channel.alipay.controller.callback; import cn.daxpay.open.channel.alipay.service.callback.AlipayCallbackService; -import cn.daxpay.open.payment.common.assist.MerchantContextLoader; +import cn.daxpay.open.payment.common.context.MerchantContextLoader; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletRequest; diff --git a/daxpay-channel/daxpay-channel-dougong/src/main/java/cn/daxpay/open/channel/dougong/controller/callback/DougongCallbackController.java b/daxpay-channel/daxpay-channel-dougong/src/main/java/cn/daxpay/open/channel/dougong/controller/callback/DougongCallbackController.java index 8534fd358..46ded6783 100644 --- a/daxpay-channel/daxpay-channel-dougong/src/main/java/cn/daxpay/open/channel/dougong/controller/callback/DougongCallbackController.java +++ b/daxpay-channel/daxpay-channel-dougong/src/main/java/cn/daxpay/open/channel/dougong/controller/callback/DougongCallbackController.java @@ -2,7 +2,7 @@ package cn.daxpay.open.channel.dougong.controller.callback; import cn.daxpay.open.channel.dougong.service.callback.DougongPayCallbackService; import cn.daxpay.open.channel.dougong.service.callback.DougongRefundCallbackService; -import cn.daxpay.open.payment.common.assist.MerchantContextLoader; +import cn.daxpay.open.payment.common.context.MerchantContextLoader; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletRequest; diff --git a/daxpay-channel/daxpay-channel-douyin/src/main/java/cn/daxpay/open/channel/douyin/controller/callback/DouyinCallbackController.java b/daxpay-channel/daxpay-channel-douyin/src/main/java/cn/daxpay/open/channel/douyin/controller/callback/DouyinCallbackController.java index 8b4c956b6..e0ce9b032 100644 --- a/daxpay-channel/daxpay-channel-douyin/src/main/java/cn/daxpay/open/channel/douyin/controller/callback/DouyinCallbackController.java +++ b/daxpay-channel/daxpay-channel-douyin/src/main/java/cn/daxpay/open/channel/douyin/controller/callback/DouyinCallbackController.java @@ -2,7 +2,7 @@ package cn.daxpay.open.channel.douyin.controller.callback; import cn.daxpay.open.channel.douyin.service.callback.DouyinPayCallbackService; import cn.daxpay.open.channel.douyin.service.callback.DouyinRefundCallbackService; -import cn.daxpay.open.payment.common.assist.MerchantContextLoader; +import cn.daxpay.open.payment.common.context.MerchantContextLoader; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletRequest; diff --git a/daxpay-channel/daxpay-channel-fuyou/src/main/java/cn/daxpay/open/channel/fuyou/controller/callback/FuyouCallbackController.java b/daxpay-channel/daxpay-channel-fuyou/src/main/java/cn/daxpay/open/channel/fuyou/controller/callback/FuyouCallbackController.java index 9fb82945f..f2ccf75f5 100644 --- a/daxpay-channel/daxpay-channel-fuyou/src/main/java/cn/daxpay/open/channel/fuyou/controller/callback/FuyouCallbackController.java +++ b/daxpay-channel/daxpay-channel-fuyou/src/main/java/cn/daxpay/open/channel/fuyou/controller/callback/FuyouCallbackController.java @@ -2,7 +2,7 @@ package cn.daxpay.open.channel.fuyou.controller.callback; import cn.daxpay.open.channel.fuyou.service.callback.FuyouPayCallbackService; import cn.daxpay.open.channel.fuyou.service.callback.FuyouRefundCallbackService; -import cn.daxpay.open.payment.common.assist.MerchantContextLoader; +import cn.daxpay.open.payment.common.context.MerchantContextLoader; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/daxpay-channel/daxpay-channel-hkrt/src/main/java/cn/daxpay/open/channel/hkrt/controller/callback/HkrtCallbackController.java b/daxpay-channel/daxpay-channel-hkrt/src/main/java/cn/daxpay/open/channel/hkrt/controller/callback/HkrtCallbackController.java index 3690af17a..0d38114a9 100644 --- a/daxpay-channel/daxpay-channel-hkrt/src/main/java/cn/daxpay/open/channel/hkrt/controller/callback/HkrtCallbackController.java +++ b/daxpay-channel/daxpay-channel-hkrt/src/main/java/cn/daxpay/open/channel/hkrt/controller/callback/HkrtCallbackController.java @@ -2,7 +2,7 @@ package cn.daxpay.open.channel.hkrt.controller.callback; import cn.daxpay.open.channel.hkrt.service.callback.HkrtPayCallbackService; import cn.daxpay.open.channel.hkrt.service.callback.HkrtRefundCallbackService; -import cn.daxpay.open.payment.common.assist.MerchantContextLoader; +import cn.daxpay.open.payment.common.context.MerchantContextLoader; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletRequest; diff --git a/daxpay-channel/daxpay-channel-hmpay/src/main/java/cn/daxpay/open/channel/hmpay/controller/callback/HmpayCallbackController.java b/daxpay-channel/daxpay-channel-hmpay/src/main/java/cn/daxpay/open/channel/hmpay/controller/callback/HmpayCallbackController.java index d4128f475..e68254c47 100644 --- a/daxpay-channel/daxpay-channel-hmpay/src/main/java/cn/daxpay/open/channel/hmpay/controller/callback/HmpayCallbackController.java +++ b/daxpay-channel/daxpay-channel-hmpay/src/main/java/cn/daxpay/open/channel/hmpay/controller/callback/HmpayCallbackController.java @@ -2,7 +2,7 @@ package cn.daxpay.open.channel.hmpay.controller.callback; import cn.daxpay.open.channel.hmpay.service.callback.HmpayPayCallbackService; import cn.daxpay.open.channel.hmpay.service.callback.HmpayRefundCallbackService; -import cn.daxpay.open.payment.common.assist.MerchantContextLoader; +import cn.daxpay.open.payment.common.context.MerchantContextLoader; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletRequest; diff --git a/daxpay-channel/daxpay-channel-lakala/src/main/java/cn/daxpay/open/channel/lakala/controller/callback/LakalaCallbackController.java b/daxpay-channel/daxpay-channel-lakala/src/main/java/cn/daxpay/open/channel/lakala/controller/callback/LakalaCallbackController.java index b86f1ae32..36dbcca7e 100644 --- a/daxpay-channel/daxpay-channel-lakala/src/main/java/cn/daxpay/open/channel/lakala/controller/callback/LakalaCallbackController.java +++ b/daxpay-channel/daxpay-channel-lakala/src/main/java/cn/daxpay/open/channel/lakala/controller/callback/LakalaCallbackController.java @@ -2,7 +2,7 @@ package cn.daxpay.open.channel.lakala.controller.callback; import cn.daxpay.open.channel.lakala.service.callback.LakalaPayCallbackService; import cn.daxpay.open.channel.lakala.service.callback.LakalaRefundCallbackService; -import cn.daxpay.open.payment.common.assist.MerchantContextLoader; +import cn.daxpay.open.payment.common.context.MerchantContextLoader; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletRequest; diff --git a/daxpay-channel/daxpay-channel-leshua/src/main/java/cn/daxpay/open/channel/leshua/controller/callback/LeshuaCallbackController.java b/daxpay-channel/daxpay-channel-leshua/src/main/java/cn/daxpay/open/channel/leshua/controller/callback/LeshuaCallbackController.java index 3341ee91f..d6af20f5a 100644 --- a/daxpay-channel/daxpay-channel-leshua/src/main/java/cn/daxpay/open/channel/leshua/controller/callback/LeshuaCallbackController.java +++ b/daxpay-channel/daxpay-channel-leshua/src/main/java/cn/daxpay/open/channel/leshua/controller/callback/LeshuaCallbackController.java @@ -2,7 +2,7 @@ package cn.daxpay.open.channel.leshua.controller.callback; import cn.daxpay.open.channel.leshua.service.callback.LeshuaPayCallbackService; import cn.daxpay.open.channel.leshua.service.callback.LeshuaRefundCallbackService; -import cn.daxpay.open.payment.common.assist.MerchantContextLoader; +import cn.daxpay.open.payment.common.context.MerchantContextLoader; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletRequest; diff --git a/daxpay-channel/daxpay-channel-ums/src/main/java/cn/daxpay/open/channel/ums/controller/callback/UmsCallbackController.java b/daxpay-channel/daxpay-channel-ums/src/main/java/cn/daxpay/open/channel/ums/controller/callback/UmsCallbackController.java index 7295aed9a..b9aff9878 100644 --- a/daxpay-channel/daxpay-channel-ums/src/main/java/cn/daxpay/open/channel/ums/controller/callback/UmsCallbackController.java +++ b/daxpay-channel/daxpay-channel-ums/src/main/java/cn/daxpay/open/channel/ums/controller/callback/UmsCallbackController.java @@ -2,7 +2,7 @@ package cn.daxpay.open.channel.ums.controller.callback; import cn.daxpay.open.channel.ums.service.callback.UmsPayCallbackService; import cn.daxpay.open.channel.ums.service.callback.UmsRefundCallbackService; -import cn.daxpay.open.payment.common.assist.MerchantContextLoader; +import cn.daxpay.open.payment.common.context.MerchantContextLoader; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletRequest; diff --git a/daxpay-channel/daxpay-channel-vbill/src/main/java/cn/daxpay/open/channel/vbill/controller/callback/VbillCallbackController.java b/daxpay-channel/daxpay-channel-vbill/src/main/java/cn/daxpay/open/channel/vbill/controller/callback/VbillCallbackController.java index 729c7c15d..dadeca8e4 100644 --- a/daxpay-channel/daxpay-channel-vbill/src/main/java/cn/daxpay/open/channel/vbill/controller/callback/VbillCallbackController.java +++ b/daxpay-channel/daxpay-channel-vbill/src/main/java/cn/daxpay/open/channel/vbill/controller/callback/VbillCallbackController.java @@ -2,7 +2,7 @@ package cn.daxpay.open.channel.vbill.controller.callback; import cn.daxpay.open.channel.vbill.service.callback.VbillPayCallbackService; import cn.daxpay.open.channel.vbill.service.callback.VbillRefundCallbackService; -import cn.daxpay.open.payment.common.assist.MerchantContextLoader; +import cn.daxpay.open.payment.common.context.MerchantContextLoader; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletRequest; diff --git a/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/controller/callback/WechatCallbackController.java b/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/controller/callback/WechatCallbackController.java index b2881efd4..f4507885d 100644 --- a/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/controller/callback/WechatCallbackController.java +++ b/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/controller/callback/WechatCallbackController.java @@ -2,7 +2,7 @@ package cn.daxpay.open.channel.wechat.controller.callback; import cn.daxpay.open.channel.wechat.service.callback.WechatPayCallbackService; import cn.daxpay.open.channel.wechat.service.callback.WechatRefundCallbackService; -import cn.daxpay.open.payment.common.assist.MerchantContextLoader; +import cn.daxpay.open.payment.common.context.MerchantContextLoader; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletRequest; diff --git a/daxpay-channel/daxpay-channel-yeepay/src/main/java/cn/daxpay/open/channel/yeepay/controller/callback/YeepayCallbackController.java b/daxpay-channel/daxpay-channel-yeepay/src/main/java/cn/daxpay/open/channel/yeepay/controller/callback/YeepayCallbackController.java index 60b2e55cc..0c71b45be 100644 --- a/daxpay-channel/daxpay-channel-yeepay/src/main/java/cn/daxpay/open/channel/yeepay/controller/callback/YeepayCallbackController.java +++ b/daxpay-channel/daxpay-channel-yeepay/src/main/java/cn/daxpay/open/channel/yeepay/controller/callback/YeepayCallbackController.java @@ -2,7 +2,7 @@ package cn.daxpay.open.channel.yeepay.controller.callback; import cn.daxpay.open.channel.yeepay.service.callback.YeepayPayCallbackService; import cn.daxpay.open.channel.yeepay.service.callback.YeepayRefundCallbackService; -import cn.daxpay.open.payment.common.assist.MerchantContextLoader; +import cn.daxpay.open.payment.common.context.MerchantContextLoader; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletRequest; diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/service/device/DeviceQrCodeAdminService.java b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/service/device/DeviceQrCodeAdminService.java index ebc53d398..c12372b4d 100644 --- a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/service/device/DeviceQrCodeAdminService.java +++ b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/service/device/DeviceQrCodeAdminService.java @@ -1,6 +1,6 @@ package cn.daxpay.open.payment.admin.service.device; -import cn.daxpay.open.payment.common.assist.MerchantContextLoader; +import cn.daxpay.open.payment.common.context.MerchantContextLoader; import cn.daxpay.open.payment.device.enums.QrCodeAmountTypeEnum; import cn.daxpay.open.payment.device.enums.QrCodeStatusEnum; import cn.daxpay.open.payment.device.qrcode.dao.DeviceQrCodeManager; diff --git a/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/auth/ChannelAuthService.java b/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/auth/ChannelAuthService.java index e62bc43bc..e7cfe3462 100644 --- a/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/auth/ChannelAuthService.java +++ b/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/auth/ChannelAuthService.java @@ -2,7 +2,7 @@ package cn.daxpay.open.payment.auth; import cn.daxpay.open.payment.merchant.dao.channel.ChannelMerchantManager; import cn.daxpay.open.payment.merchant.entity.channel.ChannelMerchant; -import cn.daxpay.open.payment.common.assist.MerchantContextLoader; +import cn.daxpay.open.payment.common.context.MerchantContextLoader; import cn.daxpay.open.payment.strategy.PaymentStrategyFactory; import cn.daxpay.open.payment.strategy.auth.AbsChannelAuthStrategy; import cn.daxpay.open.payment.unipay.param.assist.AuthCodeParam; diff --git a/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/assist/MerchantContextLoader.java b/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/context/MerchantContextLoader.java similarity index 89% rename from daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/assist/MerchantContextLoader.java rename to daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/context/MerchantContextLoader.java index 3bf9f1087..11ae801b4 100644 --- a/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/assist/MerchantContextLoader.java +++ b/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/context/MerchantContextLoader.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.common.assist; +package cn.daxpay.open.payment.common.context; import cn.daxpay.open.platform.core.code.CommonCode; import cn.daxpay.open.platform.core.code.CommonErrorCode; @@ -8,10 +8,8 @@ import cn.daxpay.open.platform.core.enums.merchant.MerchantStatusEnum; import cn.daxpay.open.platform.core.exception.BizInfoException; import cn.daxpay.open.platform.core.exception.config.ConfigNotEnableException; import cn.daxpay.open.platform.iam.service.client.ClientCodeService; -import cn.daxpay.open.payment.common.context.PaymentContext; import cn.daxpay.open.payment.common.access.MchAppInfoAccessInfo; -import cn.daxpay.open.payment.common.access.MerchantAccessInfo; -import cn.daxpay.open.payment.common.access.MerchantAccessPort; +import cn.daxpay.open.payment.merchant.service.access.MerchantAccessQueryService; import cn.hutool.core.util.StrUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -30,7 +28,7 @@ import java.util.Optional; /// - `resolveApp`:应用解析(推导默认/校验启用),仅需要应用归属时调 /// /// **商户端**特判：忽略入参 mchNo，强制用登录上下文已装载的商户号（防越权自报）。 -/// 引导阶段通过 [MerchantAccessPort] 的 `*NotTenant` 读路径； +/// 引导阶段通过 [MerchantAccessQueryService] 的 `*NotTenant` 读路径； /// **initMch 成功之后**业务链路应走正常租户过滤，勿再散落类级 `@IgnoreTenant`。 /// appId 不进线程上下文。详见 `_doc/design/mch-no-tenant-isolation.md`。 @Slf4j @@ -39,7 +37,7 @@ import java.util.Optional; public class MerchantContextLoader { private final ClientCodeService clientCodeService; - private final MerchantAccessPort merchantAccessPort; + private final MerchantAccessQueryService merchantAccessQueryService; private final PaymentContext paymentContext; /// 通道回调身份装载:仅将 path 上的 mchNo 写入上下文,不查库、不校验商户启用。 @@ -60,7 +58,7 @@ public class MerchantContextLoader { if (Objects.equals(clientCodeService.getClientCode(), ClientEnum.MERCHANT.getCode())) { mchNo = paymentContext.getMchNo(); } - var merchant = Optional.ofNullable(merchantAccessPort.getMerchantByMchNo(mchNo)) + var merchant = Optional.ofNullable(merchantAccessQueryService.getMerchantByMchNo(mchNo)) // 未找到指定的商户配置 .orElseThrow(() -> new ConfigNotEnableException("error.payment.merchant.specifiedMchConfigNotFound")); // 商户状态校验 @@ -77,11 +75,11 @@ public class MerchantContextLoader { MchAppInfoAccessInfo mchApp; if (StrUtil.isBlank(appId)) { // appId 为空,取商户默认应用 - mchApp = Optional.ofNullable(merchantAccessPort.getDefaultAppByMchNo(mchNo)) + mchApp = Optional.ofNullable(merchantAccessQueryService.getDefaultAppByMchNo(mchNo)) // 未找到商户默认应用配置 .orElseThrow(() -> new ConfigNotEnableException("error.payment.merchant.defaultAppConfigNotFound")); } else { - mchApp = Optional.ofNullable(merchantAccessPort.getAppByAppId(appId)) + mchApp = Optional.ofNullable(merchantAccessQueryService.getAppByAppId(appId)) // 未找到指定的应用配置 .orElseThrow(() -> new ConfigNotEnableException("error.payment.merchant.specifiedAppConfigNotFound")); } @@ -101,7 +99,7 @@ public class MerchantContextLoader { /// 按应用号反推商户身份并初始化(应用号已知、商户号未知的场景,如渠道配置/通道认证)。 /// 商户端会校验应用归属当前登录商户。 public void initMchByApp(String appId) { - var mchApp = Optional.ofNullable(merchantAccessPort.getAppByAppId(appId)) + var mchApp = Optional.ofNullable(merchantAccessQueryService.getAppByAppId(appId)) // 未找到指定的应用配置 .orElseThrow(() -> new ConfigNotEnableException("error.payment.merchant.specifiedAppConfigNotFound")); // 应用状态校验 diff --git a/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/trade/runtime/service/pay/NormalPayService.java b/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/trade/runtime/service/pay/NormalPayService.java index 3f3c36363..d7e9e77ba 100644 --- a/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/trade/runtime/service/pay/NormalPayService.java +++ b/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/trade/runtime/service/pay/NormalPayService.java @@ -5,7 +5,7 @@ import cn.daxpay.open.platform.core.exception.BizInfoException; import cn.daxpay.open.platform.core.exception.PayFailureException; import cn.daxpay.open.platform.common.spring.util.WebServletUtil; import cn.daxpay.open.payment.trade.enums.PayFundStatusEnum; -import cn.daxpay.open.payment.common.assist.MerchantContextLoader; +import cn.daxpay.open.payment.common.context.MerchantContextLoader; import cn.daxpay.open.payment.strategy.PaymentStrategyFactory; import cn.daxpay.open.payment.trade.runtime.bo.PayTradeResultBo; import cn.daxpay.open.payment.trade.order.dao.PayTradeManager; diff --git a/daxpay-payment/daxpay-payment-unipay/src/main/java/cn/daxpay/open/payment/unipay/aop/PaymentVerifyAspect.java b/daxpay-payment/daxpay-payment-unipay/src/main/java/cn/daxpay/open/payment/unipay/aop/PaymentVerifyAspect.java index 56b535c8a..9c7ea7d74 100644 --- a/daxpay-payment/daxpay-payment-unipay/src/main/java/cn/daxpay/open/payment/unipay/aop/PaymentVerifyAspect.java +++ b/daxpay-payment/daxpay-payment-unipay/src/main/java/cn/daxpay/open/payment/unipay/aop/PaymentVerifyAspect.java @@ -6,7 +6,7 @@ import cn.daxpay.open.platform.core.code.CommonErrorCode; import cn.daxpay.open.platform.core.util.ValidationUtil; import cn.daxpay.open.payment.unipay.param.MerchantPaymentCommonParam; import cn.daxpay.open.payment.common.result.DaxResult; -import cn.daxpay.open.payment.common.assist.MerchantContextLoader; +import cn.daxpay.open.payment.common.context.MerchantContextLoader; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; diff --git a/daxpay-payment/daxpay-payment-unipay/src/main/java/cn/daxpay/open/payment/unipay/gateway/service/GatewayOrderQueryService.java b/daxpay-payment/daxpay-payment-unipay/src/main/java/cn/daxpay/open/payment/unipay/gateway/service/GatewayOrderQueryService.java index e9aa64ad0..bde28cdde 100644 --- a/daxpay-payment/daxpay-payment-unipay/src/main/java/cn/daxpay/open/payment/unipay/gateway/service/GatewayOrderQueryService.java +++ b/daxpay-payment/daxpay-payment-unipay/src/main/java/cn/daxpay/open/payment/unipay/gateway/service/GatewayOrderQueryService.java @@ -1,6 +1,6 @@ package cn.daxpay.open.payment.unipay.gateway.service; -import cn.daxpay.open.payment.common.assist.MerchantContextLoader; +import cn.daxpay.open.payment.common.context.MerchantContextLoader; import cn.daxpay.open.payment.trade.enums.PayTradeTypeEnum; import cn.daxpay.open.payment.trade.order.dao.GatewayPayOrderManager; import cn.daxpay.open.payment.trade.order.dao.PayTradeManager; diff --git a/daxpay-payment/daxpay-payment-unipay/src/main/java/cn/daxpay/open/payment/unipay/gateway/service/GatewayPayAssistService.java b/daxpay-payment/daxpay-payment-unipay/src/main/java/cn/daxpay/open/payment/unipay/gateway/service/GatewayPayAssistService.java index 6b9b96de5..4fd4952c0 100644 --- a/daxpay-payment/daxpay-payment-unipay/src/main/java/cn/daxpay/open/payment/unipay/gateway/service/GatewayPayAssistService.java +++ b/daxpay-payment/daxpay-payment-unipay/src/main/java/cn/daxpay/open/payment/unipay/gateway/service/GatewayPayAssistService.java @@ -2,7 +2,7 @@ package cn.daxpay.open.payment.unipay.gateway.service; import cn.daxpay.open.payment.trade.enums.GatewayOrderStatusEnum; import cn.daxpay.open.payment.trade.enums.GatewayPayTypeEnum; -import cn.daxpay.open.payment.common.assist.MerchantContextLoader; +import cn.daxpay.open.payment.common.context.MerchantContextLoader; import cn.daxpay.open.payment.trade.order.dao.GatewayPayOrderManager; import cn.daxpay.open.payment.trade.order.entity.GatewayPayOrder; import cn.daxpay.open.payment.trade.runtime.service.pay.PayAssistService; diff --git a/daxpay-payment/daxpay-payment-unipay/src/main/java/cn/daxpay/open/payment/unipay/gateway/service/GatewayPayHandleService.java b/daxpay-payment/daxpay-payment-unipay/src/main/java/cn/daxpay/open/payment/unipay/gateway/service/GatewayPayHandleService.java index 76ad704ef..536e32bcf 100644 --- a/daxpay-payment/daxpay-payment-unipay/src/main/java/cn/daxpay/open/payment/unipay/gateway/service/GatewayPayHandleService.java +++ b/daxpay-payment/daxpay-payment-unipay/src/main/java/cn/daxpay/open/payment/unipay/gateway/service/GatewayPayHandleService.java @@ -3,7 +3,7 @@ package cn.daxpay.open.payment.unipay.gateway.service; import cn.daxpay.open.payment.trade.enums.GatewayOrderStatusEnum; import cn.daxpay.open.payment.trade.enums.PayFundStatusEnum; import cn.daxpay.open.payment.trade.enums.PayTradeTypeEnum; -import cn.daxpay.open.payment.common.assist.MerchantContextLoader; +import cn.daxpay.open.payment.common.context.MerchantContextLoader; import cn.daxpay.open.payment.route.service.runtime.PayRouteService; import cn.daxpay.open.payment.strategy.PaymentStrategyFactory; import cn.daxpay.open.payment.strategy.pay.AbsNormalPayStrategy;