pay/dax-pay
1
0
Fork 0
mirror of https://gitee.com/dromara/dax-pay synced 2026-08-12 15:35:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(payment): 阶段5 common 瘦身,修复 common->core 分层倒置

Browse Source 
- 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 编译通过
This commit is contained in:
DaxPay Dev
2026-07-03 10:19:42 +08:00
parent 9e0866c604
commit 4603ad19a1
25 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/service/direct/AlipayDirectAppCapabilityService.java
View File

@@ -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;

2
daxpay-channel/daxpay-channel-douyin/src/main/java/cn/daxpay/open/channel/douyin/service/direct/DouyinDirectAppCapabilityService.java
View File

@@ -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;

2
daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/service/direct/WechatDirectAppCapabilityService.java
View File

@@ -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;

2
daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/service/isv/WechatIsvAppCapabilityService.java
View File

@@ -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;

2
daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/common/strategy/PaymentStrategy.java → daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/strategy/PaymentStrategy.java
View File

@@ -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;

4
daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/common/util/PaymentStrategyFactory.java → daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/strategy/PaymentStrategyFactory.java
View File

@@ -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;

2
daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/strategy/auth/AbsChannelAuthStrategy.java
View File

@@ -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;

2
daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/strategy/pay/AbsNormalPayStrategy.java
View File

@@ -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;
/// # 抽象普通支付策略基类

2
daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/strategy/pay/AbsPayCloseStrategy.java
View File

@@ -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;
/// # 支付关闭策略

2
daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/strategy/product/AbsProductStrategy.java
View File

@@ -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;

2
daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/strategy/sync/AbsSyncPayOrderStrategy.java
View File

@@ -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;
/// # 支付同步抽象类

2
daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/service/NormalPayService.java
View File

@@ -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;

2
daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/service/PayCloseService.java
View File

@@ -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;

2
daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/service/PaySyncService.java
View File

@@ -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;

2
daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/masterdata/constants/product/service/PayProductCapabilityService.java
View File

@@ -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;

2
daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/masterdata/constants/product/service/PayProductConfigService.java
View File

@@ -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;

2
daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/masterdata/constants/product/service/PayProductService.java
View File

@@ -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;

2
daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/basic/PayRouteBasicConfigService.java
View File

@@ -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;

2
daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/basic/PayRouteBasicMatcher.java
View File

@@ -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;

2
daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/runtime/PayRouteService.java
View File

@@ -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;

2
daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/support/PayRouteStrategyCapabilitySupport.java
View File

@@ -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;

2
daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/old/pay/service/assist/ChannelAuthService.java
View File

@@ -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;

2
daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/old/pay/service/assist/ChannelBasicService.java
View File

@@ -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;

2
daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/old/pay/service/trade/pay/PayCloseService.java
View File

@@ -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;

2
daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/old/pay/service/trade/pay/PaySyncService.java
View File

@@ -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;