From 4603ad19a1d4793f02dc150404a2e5ac3755df11 Mon Sep 17 00:00:00 2001 From: DaxPay Dev Date: Fri, 3 Jul 2026 10:19:42 +0800 Subject: [PATCH] =?UTF-8?q?refactor(payment):=20=E9=98=B6=E6=AE=B55=20comm?= =?UTF-8?q?on=20=E7=98=A6=E8=BA=AB,=E4=BF=AE=E5=A4=8D=20common->core=20?= =?UTF-8?q?=E5=88=86=E5=B1=82=E5=80=92=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - PaymentStrategy 与 PaymentStrategyFactory 从 common 迁至 core/strategy - 原 common.util.PaymentStrategyFactory 依赖 core.strategy.product.AbsProductStrategy, 造成 common 反向依赖 core(底层依赖上层) - 迁移后 common 不再依赖 core, 分层方向恢复: common <- core <- 域 <- web - common 仅余横切基础设施: aop/context/runtime/handler/enums/result基类/util/service(core与merchant的中介) - payment-common 与 daxpay-channel 编译通过 --- .../service/direct/AlipayDirectAppCapabilityService.java | 2 +- .../service/direct/DouyinDirectAppCapabilityService.java | 2 +- .../service/direct/WechatDirectAppCapabilityService.java | 2 +- .../wechat/service/isv/WechatIsvAppCapabilityService.java | 2 +- .../payment/{common => core}/strategy/PaymentStrategy.java | 2 +- .../util => core/strategy}/PaymentStrategyFactory.java | 4 ++-- .../payment/core/strategy/auth/AbsChannelAuthStrategy.java | 2 +- .../open/payment/core/strategy/pay/AbsNormalPayStrategy.java | 2 +- .../open/payment/core/strategy/pay/AbsPayCloseStrategy.java | 2 +- .../payment/core/strategy/product/AbsProductStrategy.java | 2 +- .../payment/core/strategy/sync/AbsSyncPayOrderStrategy.java | 2 +- .../open/payment/core/trade/service/NormalPayService.java | 2 +- .../open/payment/core/trade/service/PayCloseService.java | 2 +- .../open/payment/core/trade/service/PaySyncService.java | 2 +- .../product/service/PayProductCapabilityService.java | 2 +- .../constants/product/service/PayProductConfigService.java | 2 +- .../constants/product/service/PayProductService.java | 2 +- .../service/route/basic/PayRouteBasicConfigService.java | 2 +- .../merchant/service/route/basic/PayRouteBasicMatcher.java | 2 +- .../merchant/service/route/runtime/PayRouteService.java | 2 +- .../route/support/PayRouteStrategyCapabilitySupport.java | 2 +- .../payment/old/pay/service/assist/ChannelAuthService.java | 2 +- .../payment/old/pay/service/assist/ChannelBasicService.java | 2 +- .../payment/old/pay/service/trade/pay/PayCloseService.java | 2 +- .../payment/old/pay/service/trade/pay/PaySyncService.java | 2 +- 25 files changed, 26 insertions(+), 26 deletions(-) rename daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/{common => core}/strategy/PaymentStrategy.java (82%) rename daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/{common/util => core/strategy}/PaymentStrategyFactory.java (96%) diff --git a/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/service/direct/AlipayDirectAppCapabilityService.java b/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/service/direct/AlipayDirectAppCapabilityService.java index 97226af84..c4b172800 100644 --- a/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/service/direct/AlipayDirectAppCapabilityService.java +++ b/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/service/direct/AlipayDirectAppCapabilityService.java @@ -15,7 +15,7 @@ import cn.daxpay.open.platform.core.code.CommonErrorCode; import cn.daxpay.open.platform.core.enums.pay.channel.PayCapabilityEnum; import cn.daxpay.open.platform.core.enums.pay.channel.ProductEnum; import cn.daxpay.open.platform.core.exception.BizInfoException; -import cn.daxpay.open.payment.common.util.PaymentStrategyFactory; +import cn.daxpay.open.payment.core.strategy.PaymentStrategyFactory; import cn.daxpay.open.payment.core.strategy.product.AbsProductStrategy; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; diff --git a/daxpay-channel/daxpay-channel-douyin/src/main/java/cn/daxpay/open/channel/douyin/service/direct/DouyinDirectAppCapabilityService.java b/daxpay-channel/daxpay-channel-douyin/src/main/java/cn/daxpay/open/channel/douyin/service/direct/DouyinDirectAppCapabilityService.java index de0d573d6..c2d332993 100644 --- a/daxpay-channel/daxpay-channel-douyin/src/main/java/cn/daxpay/open/channel/douyin/service/direct/DouyinDirectAppCapabilityService.java +++ b/daxpay-channel/daxpay-channel-douyin/src/main/java/cn/daxpay/open/channel/douyin/service/direct/DouyinDirectAppCapabilityService.java @@ -14,7 +14,7 @@ import cn.daxpay.open.platform.common.i18n.util.I18nUtil; import cn.daxpay.open.platform.core.code.CommonErrorCode; import cn.daxpay.open.platform.core.enums.pay.channel.ProductEnum; import cn.daxpay.open.platform.core.exception.BizInfoException; -import cn.daxpay.open.payment.common.util.PaymentStrategyFactory; +import cn.daxpay.open.payment.core.strategy.PaymentStrategyFactory; import cn.daxpay.open.payment.core.strategy.product.AbsProductStrategy; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; diff --git a/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/service/direct/WechatDirectAppCapabilityService.java b/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/service/direct/WechatDirectAppCapabilityService.java index 94c0f241a..87a093945 100644 --- a/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/service/direct/WechatDirectAppCapabilityService.java +++ b/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/service/direct/WechatDirectAppCapabilityService.java @@ -14,7 +14,7 @@ import cn.daxpay.open.platform.common.i18n.util.I18nUtil; import cn.daxpay.open.platform.core.code.CommonErrorCode; import cn.daxpay.open.platform.core.enums.pay.channel.ProductEnum; import cn.daxpay.open.platform.core.exception.BizInfoException; -import cn.daxpay.open.payment.common.util.PaymentStrategyFactory; +import cn.daxpay.open.payment.core.strategy.PaymentStrategyFactory; import cn.daxpay.open.payment.core.strategy.product.AbsProductStrategy; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; diff --git a/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/service/isv/WechatIsvAppCapabilityService.java b/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/service/isv/WechatIsvAppCapabilityService.java index dc00598e6..67113fdd5 100644 --- a/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/service/isv/WechatIsvAppCapabilityService.java +++ b/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/service/isv/WechatIsvAppCapabilityService.java @@ -14,7 +14,7 @@ import cn.daxpay.open.platform.common.i18n.util.I18nUtil; import cn.daxpay.open.platform.core.code.CommonErrorCode; import cn.daxpay.open.platform.core.enums.pay.channel.ProductEnum; import cn.daxpay.open.platform.core.exception.BizInfoException; -import cn.daxpay.open.payment.common.util.PaymentStrategyFactory; +import cn.daxpay.open.payment.core.strategy.PaymentStrategyFactory; import cn.daxpay.open.payment.core.strategy.product.AbsProductStrategy; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/common/strategy/PaymentStrategy.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/strategy/PaymentStrategy.java similarity index 82% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/common/strategy/PaymentStrategy.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/strategy/PaymentStrategy.java index 0bfe542b5..a25aecb47 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/common/strategy/PaymentStrategy.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/strategy/PaymentStrategy.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.common.strategy; +package cn.daxpay.open.payment.core.strategy; import cn.daxpay.open.platform.core.enums.pay.channel.ProductEnum; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/common/util/PaymentStrategyFactory.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/strategy/PaymentStrategyFactory.java similarity index 96% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/common/util/PaymentStrategyFactory.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/strategy/PaymentStrategyFactory.java index 1385af1e1..67df7c7e9 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/common/util/PaymentStrategyFactory.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/strategy/PaymentStrategyFactory.java @@ -1,8 +1,8 @@ -package cn.daxpay.open.payment.common.util; +package cn.daxpay.open.payment.core.strategy; import cn.daxpay.open.platform.core.enums.pay.channel.PayProviderEnum; import cn.daxpay.open.platform.core.exception.business.UnsupportedAbilityException; -import cn.daxpay.open.payment.common.strategy.PaymentStrategy; +import cn.daxpay.open.payment.core.strategy.PaymentStrategy; import cn.daxpay.open.payment.core.strategy.product.AbsProductStrategy; import cn.daxpay.open.payment.old.pay.support.ProductStrategySupport; import cn.hutool.extra.spring.SpringUtil; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/strategy/auth/AbsChannelAuthStrategy.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/strategy/auth/AbsChannelAuthStrategy.java index 333fed18c..db6e2c12e 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/strategy/auth/AbsChannelAuthStrategy.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/strategy/auth/AbsChannelAuthStrategy.java @@ -1,6 +1,6 @@ package cn.daxpay.open.payment.core.strategy.auth; -import cn.daxpay.open.payment.common.strategy.PaymentStrategy; +import cn.daxpay.open.payment.core.strategy.PaymentStrategy; import cn.daxpay.open.payment.unipay.param.assist.AuthCodeParam; import cn.daxpay.open.payment.unipay.param.assist.GenerateAuthUrlParam; import cn.daxpay.open.payment.unipay.result.assist.AuthResult; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/strategy/pay/AbsNormalPayStrategy.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/strategy/pay/AbsNormalPayStrategy.java index 952a4ec2a..2a24327b6 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/strategy/pay/AbsNormalPayStrategy.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/strategy/pay/AbsNormalPayStrategy.java @@ -1,6 +1,6 @@ package cn.daxpay.open.payment.core.strategy.pay; -import cn.daxpay.open.payment.common.strategy.PaymentStrategy; +import cn.daxpay.open.payment.core.strategy.PaymentStrategy; import cn.daxpay.open.payment.core.trade.bo.PayTradeResultBo; /// # 抽象普通支付策略基类 diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/strategy/pay/AbsPayCloseStrategy.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/strategy/pay/AbsPayCloseStrategy.java index 9e9cfa00d..d516ff74c 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/strategy/pay/AbsPayCloseStrategy.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/strategy/pay/AbsPayCloseStrategy.java @@ -1,6 +1,6 @@ package cn.daxpay.open.payment.core.strategy.pay; -import cn.daxpay.open.payment.common.strategy.PaymentStrategy; +import cn.daxpay.open.payment.core.strategy.PaymentStrategy; import cn.daxpay.open.platform.core.enums.pay.pay.CloseTypeEnum; /// # 支付关闭策略 diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/strategy/product/AbsProductStrategy.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/strategy/product/AbsProductStrategy.java index 923f21b0a..b938659fa 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/strategy/product/AbsProductStrategy.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/strategy/product/AbsProductStrategy.java @@ -1,6 +1,6 @@ package cn.daxpay.open.payment.core.strategy.product; -import cn.daxpay.open.payment.common.strategy.PaymentStrategy; +import cn.daxpay.open.payment.core.strategy.PaymentStrategy; import cn.daxpay.open.platform.core.enums.pay.channel.ChannelApiCallMode; import cn.daxpay.open.platform.core.enums.pay.channel.ChannelPayIdType; import cn.daxpay.open.platform.core.enums.pay.channel.PayCapabilityEnum; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/strategy/sync/AbsSyncPayOrderStrategy.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/strategy/sync/AbsSyncPayOrderStrategy.java index c8b222b9d..c23aa6c27 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/strategy/sync/AbsSyncPayOrderStrategy.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/strategy/sync/AbsSyncPayOrderStrategy.java @@ -1,7 +1,7 @@ package cn.daxpay.open.payment.core.strategy.sync; import cn.daxpay.open.payment.core.strategy.pay.PayStrategyContext; -import cn.daxpay.open.payment.common.strategy.PaymentStrategy; +import cn.daxpay.open.payment.core.strategy.PaymentStrategy; import cn.daxpay.open.payment.core.trade.bo.PaySyncResultBo; /// # 支付同步抽象类 diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/service/NormalPayService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/service/NormalPayService.java index 990741ee9..dc7d4d41a 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/service/NormalPayService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/service/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.payment.common.enums.PayFundStatusEnum; import cn.daxpay.open.payment.common.service.MerchantContextLoader; -import cn.daxpay.open.payment.common.util.PaymentStrategyFactory; +import cn.daxpay.open.payment.core.strategy.PaymentStrategyFactory; import cn.daxpay.open.payment.core.trade.bo.PayTradeResultBo; import cn.daxpay.open.payment.core.trade.dao.PayTradeManager; import cn.daxpay.open.payment.core.trade.entity.PayTrade; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/service/PayCloseService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/service/PayCloseService.java index 012d49870..366b88b81 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/service/PayCloseService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/service/PayCloseService.java @@ -8,7 +8,7 @@ import cn.daxpay.open.platform.core.exception.PayFailureException; import cn.daxpay.open.platform.core.exception.operation.OperationFailException; import cn.daxpay.open.payment.core.strategy.pay.PayStrategyContext; import cn.daxpay.open.payment.common.enums.PayFundStatusEnum; -import cn.daxpay.open.payment.common.util.PaymentStrategyFactory; +import cn.daxpay.open.payment.core.strategy.PaymentStrategyFactory; import cn.daxpay.open.payment.core.trade.dao.NormalPayOrderManager; import cn.daxpay.open.payment.core.trade.entity.NormalPayOrder; import cn.daxpay.open.payment.core.trade.dao.PayTradeManager; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/service/PaySyncService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/service/PaySyncService.java index fe910e8b6..1d4a303ca 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/service/PaySyncService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/service/PaySyncService.java @@ -9,7 +9,7 @@ import cn.daxpay.open.platform.core.exception.system.SystemUnknownErrorException import cn.daxpay.open.platform.core.util.DateTimeUtil; import cn.daxpay.open.payment.core.strategy.pay.PayStrategyContext; import cn.daxpay.open.payment.common.enums.PayFundStatusEnum; -import cn.daxpay.open.payment.common.util.PaymentStrategyFactory; +import cn.daxpay.open.payment.core.strategy.PaymentStrategyFactory; import cn.daxpay.open.payment.core.trade.bo.PaySyncResultBo; import cn.daxpay.open.payment.core.trade.dao.NormalPayOrderManager; import cn.daxpay.open.payment.core.trade.entity.NormalPayOrder; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/masterdata/constants/product/service/PayProductCapabilityService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/masterdata/constants/product/service/PayProductCapabilityService.java index d81ce9e17..9f9f1a181 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/masterdata/constants/product/service/PayProductCapabilityService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/masterdata/constants/product/service/PayProductCapabilityService.java @@ -1,6 +1,6 @@ package cn.daxpay.open.payment.masterdata.constants.product.service; -import cn.daxpay.open.payment.common.util.PaymentStrategyFactory; +import cn.daxpay.open.payment.core.strategy.PaymentStrategyFactory; import cn.daxpay.open.payment.masterdata.constants.capability.dao.PayCapabilityManager; import cn.daxpay.open.payment.masterdata.constants.capability.dao.PayProductCapabilityManager; import cn.daxpay.open.payment.masterdata.constants.capability.entity.PayCapability; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/masterdata/constants/product/service/PayProductConfigService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/masterdata/constants/product/service/PayProductConfigService.java index c1955d0dd..c6fda065c 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/masterdata/constants/product/service/PayProductConfigService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/masterdata/constants/product/service/PayProductConfigService.java @@ -1,6 +1,6 @@ package cn.daxpay.open.payment.masterdata.constants.product.service; -import cn.daxpay.open.payment.common.util.PaymentStrategyFactory; +import cn.daxpay.open.payment.core.strategy.PaymentStrategyFactory; import cn.daxpay.open.payment.masterdata.constants.product.dao.PayProductConfigManager; import cn.daxpay.open.payment.masterdata.constants.product.entity.PayProduct; import cn.daxpay.open.payment.masterdata.constants.product.entity.PayProductConfig; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/masterdata/constants/product/service/PayProductService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/masterdata/constants/product/service/PayProductService.java index c57178030..765475b9f 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/masterdata/constants/product/service/PayProductService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/masterdata/constants/product/service/PayProductService.java @@ -1,6 +1,6 @@ package cn.daxpay.open.payment.masterdata.constants.product.service; -import cn.daxpay.open.payment.common.util.PaymentStrategyFactory; +import cn.daxpay.open.payment.core.strategy.PaymentStrategyFactory; import cn.daxpay.open.payment.masterdata.constants.product.dao.PayProductManager; import cn.daxpay.open.payment.masterdata.constants.product.entity.PayProduct; import cn.daxpay.open.payment.masterdata.constants.product.param.PayProductQuery; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/basic/PayRouteBasicConfigService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/basic/PayRouteBasicConfigService.java index 2c0327a50..cf7735c97 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/basic/PayRouteBasicConfigService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/basic/PayRouteBasicConfigService.java @@ -2,7 +2,7 @@ package cn.daxpay.open.payment.merchant.service.route.basic; import cn.daxpay.open.payment.channel.dao.mch.ChannelMerchantManager; import cn.daxpay.open.payment.channel.entity.mch.ChannelMerchant; -import cn.daxpay.open.payment.common.util.PaymentStrategyFactory; +import cn.daxpay.open.payment.core.strategy.PaymentStrategyFactory; import cn.daxpay.open.payment.merchant.dao.appinfo.MchAppInfoManager; import cn.daxpay.open.payment.merchant.dao.route.basic.PayRouteBasicConfigManager; import cn.daxpay.open.payment.merchant.dao.route.strategy.PayRouteStrategyManager; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/basic/PayRouteBasicMatcher.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/basic/PayRouteBasicMatcher.java index 3307e8574..10c8a6077 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/basic/PayRouteBasicMatcher.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/basic/PayRouteBasicMatcher.java @@ -1,6 +1,6 @@ package cn.daxpay.open.payment.merchant.service.route.basic; -import cn.daxpay.open.payment.common.util.PaymentStrategyFactory; +import cn.daxpay.open.payment.core.strategy.PaymentStrategyFactory; import cn.daxpay.open.payment.merchant.entity.route.basic.PayRouteBasicConfig; import cn.daxpay.open.payment.merchant.service.route.model.RouteHit; import cn.daxpay.open.payment.merchant.service.route.runtime.PayRouteProductResolver; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/runtime/PayRouteService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/runtime/PayRouteService.java index 7a7b7c329..3dd1c9fcc 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/runtime/PayRouteService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/runtime/PayRouteService.java @@ -1,6 +1,6 @@ package cn.daxpay.open.payment.merchant.service.route.runtime; -import cn.daxpay.open.payment.common.util.PaymentStrategyFactory; +import cn.daxpay.open.payment.core.strategy.PaymentStrategyFactory; import cn.daxpay.open.payment.merchant.dao.route.basic.PayRouteBasicConfigManager; import cn.daxpay.open.payment.merchant.dao.route.scene.PayRouteSceneConfigManager; import cn.daxpay.open.payment.merchant.dao.route.strategy.PayRouteStrategyManager; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/support/PayRouteStrategyCapabilitySupport.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/support/PayRouteStrategyCapabilitySupport.java index 2b28761e4..b5a4b957c 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/support/PayRouteStrategyCapabilitySupport.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/support/PayRouteStrategyCapabilitySupport.java @@ -2,7 +2,7 @@ package cn.daxpay.open.payment.merchant.service.route.support; import cn.daxpay.open.payment.channel.dao.mch.ChannelMerchantManager; import cn.daxpay.open.payment.channel.entity.mch.ChannelMerchant; -import cn.daxpay.open.payment.common.util.PaymentStrategyFactory; +import cn.daxpay.open.payment.core.strategy.PaymentStrategyFactory; import cn.daxpay.open.payment.merchant.param.route.scene.PayRouteSceneCapabilityBatchItem; import cn.daxpay.open.payment.masterdata.constants.capability.dao.PayCapabilityManager; import cn.daxpay.open.payment.masterdata.constants.capability.dao.PayProductCapabilityManager; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/old/pay/service/assist/ChannelAuthService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/old/pay/service/assist/ChannelAuthService.java index 11ac17e83..f7ac8f7b3 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/old/pay/service/assist/ChannelAuthService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/old/pay/service/assist/ChannelAuthService.java @@ -1,7 +1,7 @@ package cn.daxpay.open.payment.old.pay.service.assist; import cn.daxpay.open.payment.common.service.MerchantContextLoader; -import cn.daxpay.open.payment.common.util.PaymentStrategyFactory; +import cn.daxpay.open.payment.core.strategy.PaymentStrategyFactory; import cn.daxpay.open.payment.core.strategy.auth.AbsChannelAuthStrategy; import cn.daxpay.open.platform.common.json.util.JacksonUtil; import cn.daxpay.open.platform.core.enums.unipay.ChannelAuthStatusEnum; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/old/pay/service/assist/ChannelBasicService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/old/pay/service/assist/ChannelBasicService.java index 0cff4f935..eccf68b4d 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/old/pay/service/assist/ChannelBasicService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/old/pay/service/assist/ChannelBasicService.java @@ -2,7 +2,7 @@ package cn.daxpay.open.payment.old.pay.service.assist; import cn.daxpay.open.platform.common.i18n.util.I18nUtil; import cn.daxpay.open.platform.core.rest.dto.LabelValue; -import cn.daxpay.open.payment.common.util.PaymentStrategyFactory; +import cn.daxpay.open.payment.core.strategy.PaymentStrategyFactory; import cn.daxpay.open.payment.core.strategy.product.AbsProductStrategy; import cn.daxpay.open.payment.old.pay.support.ProductStrategySupport; import lombok.RequiredArgsConstructor; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/old/pay/service/trade/pay/PayCloseService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/old/pay/service/trade/pay/PayCloseService.java index 4e2264159..f830e03d7 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/old/pay/service/trade/pay/PayCloseService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/old/pay/service/trade/pay/PayCloseService.java @@ -7,7 +7,7 @@ import cn.daxpay.open.platform.core.code.CommonCode; import cn.daxpay.open.platform.core.code.DaxPayErrorCode; import cn.daxpay.open.platform.core.exception.operation.OperationFailException; import cn.daxpay.open.platform.core.exception.PayFailureException; -import cn.daxpay.open.payment.common.util.PaymentStrategyFactory; +import cn.daxpay.open.payment.core.strategy.PaymentStrategyFactory; import cn.daxpay.open.payment.core.trade.entity.PayTrade; import cn.daxpay.open.payment.old.pay.dao.order.pay.PayOrderManager; import cn.daxpay.open.payment.old.pay.entity.order.pay.PayOrder; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/old/pay/service/trade/pay/PaySyncService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/old/pay/service/trade/pay/PaySyncService.java index bd4bc9c22..48f768329 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/old/pay/service/trade/pay/PaySyncService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/old/pay/service/trade/pay/PaySyncService.java @@ -9,7 +9,7 @@ import cn.daxpay.open.platform.core.util.DateTimeUtil; import cn.daxpay.open.platform.core.exception.system.DataErrorException; import cn.daxpay.open.platform.core.exception.PayFailureException; import cn.daxpay.open.platform.core.exception.system.SystemUnknownErrorException; -import cn.daxpay.open.payment.common.util.PaymentStrategyFactory; +import cn.daxpay.open.payment.core.strategy.PaymentStrategyFactory; import cn.daxpay.open.payment.old.pay.bo.sync.PaySyncResultBo; import cn.daxpay.open.payment.old.pay.convert.order.pay.PayOrderConvert; import cn.daxpay.open.payment.old.pay.dao.order.pay.PayOrderExpandManager;