diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/strategy/PaymentStrategyFactory.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/strategy/PaymentStrategyFactory.java index 67df7c7e9..5cf4700b0 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/strategy/PaymentStrategyFactory.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/strategy/PaymentStrategyFactory.java @@ -4,7 +4,7 @@ import cn.daxpay.open.platform.core.enums.pay.channel.PayProviderEnum; import cn.daxpay.open.platform.core.exception.business.UnsupportedAbilityException; 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.daxpay.open.payment.core.strategy.ProductStrategySupport; import cn.hutool.extra.spring.SpringUtil; import lombok.experimental.UtilityClass; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/old/pay/support/ProductStrategySupport.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/strategy/ProductStrategySupport.java similarity index 98% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/old/pay/support/ProductStrategySupport.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/strategy/ProductStrategySupport.java index f77063161..dfcb19da3 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/old/pay/support/ProductStrategySupport.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/strategy/ProductStrategySupport.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.old.pay.support; +package cn.daxpay.open.payment.core.strategy; import cn.daxpay.open.payment.core.strategy.product.AbsProductStrategy; 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/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 9f9f1a181..1a8429060 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 @@ -8,7 +8,7 @@ import cn.daxpay.open.payment.masterdata.constants.product.entity.PayProductCapa import cn.daxpay.open.payment.masterdata.constants.product.result.PayProductCapabilityResult; import cn.daxpay.open.payment.masterdata.constants.product.result.PayProductResult; import cn.daxpay.open.payment.core.strategy.product.AbsProductStrategy; -import cn.daxpay.open.payment.old.pay.support.ProductStrategySupport; +import cn.daxpay.open.payment.core.strategy.ProductStrategySupport; import cn.daxpay.open.platform.common.i18n.util.I18nUtil; import cn.daxpay.open.platform.core.enums.pay.channel.PayCapabilityEnum; import cn.daxpay.open.platform.core.enums.pay.channel.PayMethodEnum; 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 10c8a6077..7b8e6c27a 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 @@ -5,7 +5,7 @@ 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; import cn.daxpay.open.payment.merchant.service.route.support.PayRouteI18nHelper; -import cn.daxpay.open.payment.old.pay.support.ProductStrategySupport; +import cn.daxpay.open.payment.core.strategy.ProductStrategySupport; import cn.daxpay.open.payment.core.strategy.product.AbsProductStrategy; import cn.daxpay.open.payment.unipay.param.trade.pay.NormalPayParam; import cn.daxpay.open.platform.core.code.CommonErrorCode; 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 3dd1c9fcc..3f8805f0c 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 @@ -10,7 +10,7 @@ import cn.daxpay.open.payment.merchant.service.route.support.PayRouteStrategyCap import cn.daxpay.open.payment.merchant.service.route.model.RouteHit; import cn.daxpay.open.payment.merchant.entity.route.strategy.PayRouteStrategy; import cn.daxpay.open.payment.merchant.service.route.model.PayRouteBundle; -import cn.daxpay.open.payment.old.pay.support.ProductStrategySupport; +import cn.daxpay.open.payment.core.strategy.ProductStrategySupport; import cn.daxpay.open.payment.core.route.PayRouteFacade; import cn.daxpay.open.payment.core.strategy.product.AbsProductStrategy; import cn.daxpay.open.payment.unipay.param.trade.pay.NormalPayParam; 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 b5a4b957c..df660feb9 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 @@ -11,7 +11,7 @@ import cn.daxpay.open.payment.masterdata.constants.product.entity.PayProductCapa import cn.daxpay.open.payment.masterdata.constants.product.service.PayProductCapabilityService; import cn.daxpay.open.payment.masterdata.constants.provider.dao.PayProviderMethodManager; import cn.daxpay.open.payment.masterdata.constants.provider.service.PayProviderMethodService; -import cn.daxpay.open.payment.old.pay.support.ProductStrategySupport; +import cn.daxpay.open.payment.core.strategy.ProductStrategySupport; import cn.daxpay.open.payment.core.strategy.product.AbsProductStrategy; import cn.daxpay.open.platform.common.i18n.util.I18nUtil; import cn.daxpay.open.platform.core.code.CommonErrorCode; 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 eccf68b4d..8dbb166ee 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 @@ -4,7 +4,7 @@ import cn.daxpay.open.platform.common.i18n.util.I18nUtil; import cn.daxpay.open.platform.core.rest.dto.LabelValue; 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 cn.daxpay.open.payment.core.strategy.ProductStrategySupport; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service;