From 8aa3ddbe7ca105fbfe6904e2d83d8dded03d6348 Mon Sep 17 00:00:00 2001 From: DaxPay Dev Date: Fri, 3 Jul 2026 09:56:55 +0800 Subject: [PATCH] =?UTF-8?q?refactor(payment):=20=E9=98=B6=E6=AE=B51=20?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=A0=B8=E5=BF=83=E5=9F=9F=E5=88=86=E5=8C=85?= =?UTF-8?q?=E8=87=B3=20core?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - pay/* 与 strategy/* 迁移至 core/{trade,route,strategy} - 清理 PayAssistService 对 merchant.MchAppInfoService 的未使用注入, 消除 core->merchant 循环依赖 - core 确立零业务域依赖原则(不引用 merchant/masterdata/channel/device/web) - 同步更新 daxpay-channel 各通道模块的 import - payment-common 与 daxpay-channel 编译通过 --- .../AlipayDirectAppCapabilityService.java | 2 +- .../payment/close/AlipayCloseService.java | 2 +- .../service/payment/pay/AlipayPayService.java | 4 ++-- .../payment/sync/AlipaySyncService.java | 4 ++-- .../direct/AlipayDirectCloseStrategy.java | 8 ++++---- .../direct/AlipayDirectPayStrategy.java | 6 +++--- .../direct/AlipayDirectProductStrategy.java | 2 +- .../direct/AlipayDirectSyncStrategy.java | 8 ++++---- .../strategy/isv/AlipayIsvCloseStrategy.java | 6 +++--- .../strategy/isv/AlipayIsvPayStrategy.java | 6 +++--- .../isv/AlipayIsvProductStrategy.java | 2 +- .../strategy/isv/AlipayIsvSyncStrategy.java | 8 ++++---- .../DouyinDirectAppCapabilityService.java | 2 +- .../strategy/DouyinDirectPayStrategy.java | 6 +++--- .../strategy/DouyinPayProductStrategy.java | 2 +- .../strategy/LakalaProductStrategy.java | 2 +- .../ums/strategy/UmsAppProductStrategy.java | 2 +- .../strategy/UmsBarcodeProductStrategy.java | 2 +- .../ums/strategy/UmsH5ProductStrategy.java | 2 +- .../ums/strategy/UmsJsapiProductStrategy.java | 2 +- .../ums/strategy/UmsMiniProductStrategy.java | 2 +- .../strategy/UmsQrcodeProductStrategy.java | 2 +- .../WechatDirectAppCapabilityService.java | 2 +- .../isv/WechatIsvAppCapabilityService.java | 2 +- .../strategy/WechatDirectProductStrategy.java | 2 +- .../strategy/WechatIsvProductStrategy.java | 2 +- .../order/NormalPayOrderAdminController.java | 6 +++--- .../order/PayTradeAdminController.java | 6 +++--- .../service/develop/DevelopTradeService.java | 2 +- .../common/util/PaymentStrategyFactory.java | 2 +- .../route/PayRouteFacade.java | 2 +- .../strategy/auth/AbsChannelAuthStrategy.java | 2 +- .../strategy/pay/AbsNormalPayStrategy.java | 4 ++-- .../strategy/pay/AbsPayCloseStrategy.java | 2 +- .../strategy/pay/PayStrategyContext.java | 6 +++--- .../strategy/product/AbsProductStrategy.java | 2 +- .../sync/AbsSyncPayOrderStrategy.java | 6 +++--- .../trade}/bo/PaySyncResultBo.java | 2 +- .../trade}/bo/PayTradeResultBo.java | 2 +- .../trade}/convert/NormalPayOrderConvert.java | 6 +++--- .../trade}/convert/PayTradeAdminConvert.java | 6 +++--- .../trade}/convert/PayTradeConvert.java | 6 +++--- .../trade}/dao/NormalPayOrderManager.java | 6 +++--- .../trade}/dao/NormalPayOrderMapper.java | 4 ++-- .../trade}/dao/PayTradeManager.java | 6 +++--- .../trade}/dao/PayTradeMapper.java | 4 ++-- .../trade}/entity/NormalPayOrder.java | 2 +- .../trade}/entity/PayAuthOrder.java | 2 +- .../trade}/entity/PayCombineOrder.java | 2 +- .../trade}/entity/PayRecurringOrder.java | 2 +- .../order => core/trade}/entity/PayTrade.java | 2 +- .../trade/param}/NormalPayOrderQuery.java | 2 +- .../trade/param}/PayTradeQuery.java | 2 +- .../trade/result}/NormalPayOrderResult.java | 2 +- .../trade/result}/PayTradeResult.java | 2 +- .../trade}/service/NormalPayService.java | 14 ++++++------- .../trade}/service/PayAssistService.java | 16 +++++++-------- .../trade}/service/PayCallbackService.java | 10 +++++----- .../trade}/service/PayCloseService.java | 14 ++++++------- .../trade}/service/PaySyncService.java | 16 +++++++-------- .../trade}/service/PayUniHandleService.java | 10 +++++----- .../admin/NormalPayOrderAdminService.java | 20 +++++++++---------- .../service/admin/PayTradeAdminService.java | 20 +++++++++---------- .../service/PayProductCapabilityService.java | 2 +- .../service/PayProductConfigService.java | 2 +- .../product/service/PayProductService.java | 2 +- .../basic/PayRouteBasicConfigService.java | 2 +- .../route/basic/PayRouteBasicMatcher.java | 2 +- .../route/runtime/PayRouteService.java | 4 ++-- .../PayRouteStrategyCapabilitySupport.java | 2 +- .../service/assist/ChannelAuthService.java | 2 +- .../service/assist/ChannelBasicService.java | 2 +- .../service/trade/pay/PayCloseService.java | 6 +++--- .../pay/service/trade/pay/PaySyncService.java | 8 ++++---- .../pay/support/ProductStrategySupport.java | 2 +- .../unipay/controller/UniTradeController.java | 4 ++-- 76 files changed, 174 insertions(+), 176 deletions(-) rename daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/{pay/service => core}/route/PayRouteFacade.java (91%) rename daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/{ => core}/strategy/auth/AbsChannelAuthStrategy.java (93%) rename daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/{ => core}/strategy/pay/AbsNormalPayStrategy.java (86%) rename daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/{ => core}/strategy/pay/AbsPayCloseStrategy.java (94%) rename daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/{ => core}/strategy/pay/PayStrategyContext.java (87%) rename daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/{ => core}/strategy/product/AbsProductStrategy.java (96%) rename daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/{ => core}/strategy/sync/AbsSyncPayOrderStrategy.java (73%) rename daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/{pay => core/trade}/bo/PaySyncResultBo.java (97%) rename daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/{pay => core/trade}/bo/PayTradeResultBo.java (97%) rename daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/{pay => core/trade}/convert/NormalPayOrderConvert.java (75%) rename daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/{pay => core/trade}/convert/PayTradeAdminConvert.java (75%) rename daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/{pay => core/trade}/convert/PayTradeConvert.java (82%) rename daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/{pay/order => core/trade}/dao/NormalPayOrderManager.java (88%) rename daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/{pay/order => core/trade}/dao/NormalPayOrderMapper.java (66%) rename daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/{pay/order => core/trade}/dao/PayTradeManager.java (93%) rename daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/{pay/order => core/trade}/dao/PayTradeMapper.java (66%) rename daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/{pay/order => core/trade}/entity/NormalPayOrder.java (98%) rename daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/{pay/order => core/trade}/entity/PayAuthOrder.java (97%) rename daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/{pay/order => core/trade}/entity/PayCombineOrder.java (96%) rename daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/{pay/order => core/trade}/entity/PayRecurringOrder.java (97%) rename daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/{pay/order => core/trade}/entity/PayTrade.java (98%) rename daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/{pay/param/order => core/trade/param}/NormalPayOrderQuery.java (98%) rename daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/{pay/param/order => core/trade/param}/PayTradeQuery.java (98%) rename daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/{pay/result/order => core/trade/result}/NormalPayOrderResult.java (98%) rename daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/{pay/result/order => core/trade/result}/PayTradeResult.java (98%) rename daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/{pay => core/trade}/service/NormalPayService.java (92%) rename daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/{pay => core/trade}/service/PayAssistService.java (93%) rename daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/{pay => core/trade}/service/PayCallbackService.java (92%) rename daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/{pay => core/trade}/service/PayCloseService.java (90%) rename daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/{pay => core/trade}/service/PaySyncService.java (93%) rename daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/{pay => core/trade}/service/PayUniHandleService.java (91%) rename daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/{pay => core/trade}/service/admin/NormalPayOrderAdminService.java (84%) rename daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/{pay => core/trade}/service/admin/PayTradeAdminService.java (82%) 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 09707fcc4..97226af84 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 @@ -16,7 +16,7 @@ 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.strategy.product.AbsProductStrategy; +import cn.daxpay.open.payment.core.strategy.product.AbsProductStrategy; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import lombok.RequiredArgsConstructor; diff --git a/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/service/payment/close/AlipayCloseService.java b/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/service/payment/close/AlipayCloseService.java index a1598fce4..28d3ae451 100644 --- a/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/service/payment/close/AlipayCloseService.java +++ b/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/service/payment/close/AlipayCloseService.java @@ -5,7 +5,7 @@ import cn.daxpay.open.channel.alipay.client.credential.AlipaySdkCredential; import cn.daxpay.open.channel.alipay.client.req.AlipayCloseReq; import cn.daxpay.open.channel.alipay.client.resp.AlipayCloseResp; import cn.daxpay.open.payment.common.result.DaxResult; -import cn.daxpay.open.payment.pay.order.entity.PayTrade; +import cn.daxpay.open.payment.core.trade.entity.PayTrade; import cn.daxpay.open.platform.core.enums.pay.pay.CloseTypeEnum; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/service/payment/pay/AlipayPayService.java b/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/service/payment/pay/AlipayPayService.java index 432ff30dc..53a3eadb8 100644 --- a/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/service/payment/pay/AlipayPayService.java +++ b/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/service/payment/pay/AlipayPayService.java @@ -7,8 +7,8 @@ import cn.daxpay.open.channel.alipay.client.enums.AlipayPayMethod; import cn.daxpay.open.channel.alipay.client.req.AlipayPayReq; import cn.daxpay.open.channel.alipay.client.resp.AlipayPayResp; import cn.daxpay.open.payment.common.result.DaxResult; -import cn.daxpay.open.payment.pay.bo.PayTradeResultBo; -import cn.daxpay.open.payment.pay.order.entity.PayTrade; +import cn.daxpay.open.payment.core.trade.bo.PayTradeResultBo; +import cn.daxpay.open.payment.core.trade.entity.PayTrade; import cn.daxpay.open.payment.unipay.param.trade.pay.NormalPayParam; import cn.daxpay.open.platform.core.enums.pay.channel.PayMethodEnum; import cn.daxpay.open.platform.core.enums.unipay.PayBodyTypeEnum; diff --git a/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/service/payment/sync/AlipaySyncService.java b/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/service/payment/sync/AlipaySyncService.java index 2a2552998..8b654f864 100644 --- a/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/service/payment/sync/AlipaySyncService.java +++ b/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/service/payment/sync/AlipaySyncService.java @@ -6,8 +6,8 @@ import cn.daxpay.open.channel.alipay.client.req.AlipaySyncReq; import cn.daxpay.open.channel.alipay.client.resp.AlipaySyncResp; import cn.daxpay.open.payment.common.result.DaxResult; import cn.daxpay.open.payment.common.enums.PayFundStatusEnum; -import cn.daxpay.open.payment.pay.bo.PaySyncResultBo; -import cn.daxpay.open.payment.pay.order.entity.PayTrade; +import cn.daxpay.open.payment.core.trade.bo.PaySyncResultBo; +import cn.daxpay.open.payment.core.trade.entity.PayTrade; import cn.hutool.core.util.StrUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/strategy/direct/AlipayDirectCloseStrategy.java b/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/strategy/direct/AlipayDirectCloseStrategy.java index b02dcf32a..d4f597b94 100644 --- a/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/strategy/direct/AlipayDirectCloseStrategy.java +++ b/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/strategy/direct/AlipayDirectCloseStrategy.java @@ -3,10 +3,10 @@ package cn.daxpay.open.channel.alipay.strategy.direct; import cn.daxpay.open.channel.alipay.client.credential.AlipaySdkCredential; import cn.daxpay.open.channel.alipay.service.direct.AlipayDirectConfigAssembler; import cn.daxpay.open.channel.alipay.service.payment.close.AlipayCloseService; -import cn.daxpay.open.payment.strategy.pay.PayStrategyContext; -import cn.daxpay.open.payment.pay.order.entity.NormalPayOrder; -import cn.daxpay.open.payment.pay.order.entity.PayTrade; -import cn.daxpay.open.payment.strategy.pay.AbsPayCloseStrategy; +import cn.daxpay.open.payment.core.strategy.pay.PayStrategyContext; +import cn.daxpay.open.payment.core.trade.entity.NormalPayOrder; +import cn.daxpay.open.payment.core.trade.entity.PayTrade; +import cn.daxpay.open.payment.core.strategy.pay.AbsPayCloseStrategy; import cn.daxpay.open.platform.core.enums.pay.pay.CloseTypeEnum; import cn.daxpay.open.platform.core.enums.pay.channel.ProductEnum; import lombok.RequiredArgsConstructor; diff --git a/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/strategy/direct/AlipayDirectPayStrategy.java b/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/strategy/direct/AlipayDirectPayStrategy.java index c83b8f227..c94670536 100644 --- a/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/strategy/direct/AlipayDirectPayStrategy.java +++ b/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/strategy/direct/AlipayDirectPayStrategy.java @@ -3,9 +3,9 @@ package cn.daxpay.open.channel.alipay.strategy.direct; import cn.daxpay.open.channel.alipay.client.credential.AlipaySdkCredential; import cn.daxpay.open.channel.alipay.service.direct.AlipayDirectConfigAssembler; import cn.daxpay.open.channel.alipay.service.payment.pay.AlipayPayService; -import cn.daxpay.open.payment.strategy.pay.PayStrategyContext; -import cn.daxpay.open.payment.pay.bo.PayTradeResultBo; -import cn.daxpay.open.payment.strategy.pay.AbsNormalPayStrategy; +import cn.daxpay.open.payment.core.strategy.pay.PayStrategyContext; +import cn.daxpay.open.payment.core.trade.bo.PayTradeResultBo; +import cn.daxpay.open.payment.core.strategy.pay.AbsNormalPayStrategy; import cn.daxpay.open.payment.unipay.param.trade.pay.NormalPayParam; import cn.daxpay.open.platform.core.enums.pay.channel.ProductEnum; import lombok.RequiredArgsConstructor; diff --git a/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/strategy/direct/AlipayDirectProductStrategy.java b/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/strategy/direct/AlipayDirectProductStrategy.java index b98a34a59..de9aa7632 100644 --- a/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/strategy/direct/AlipayDirectProductStrategy.java +++ b/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/strategy/direct/AlipayDirectProductStrategy.java @@ -6,7 +6,7 @@ import cn.daxpay.open.platform.core.enums.pay.channel.PayCapabilityEnum; import cn.daxpay.open.platform.core.enums.pay.channel.PayMethodEnum; import cn.daxpay.open.platform.core.enums.pay.channel.PayProviderEnum; import cn.daxpay.open.platform.core.enums.pay.channel.ProductEnum; -import cn.daxpay.open.payment.strategy.product.AbsProductStrategy; +import cn.daxpay.open.payment.core.strategy.product.AbsProductStrategy; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/strategy/direct/AlipayDirectSyncStrategy.java b/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/strategy/direct/AlipayDirectSyncStrategy.java index 334fe7425..0ef57292f 100644 --- a/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/strategy/direct/AlipayDirectSyncStrategy.java +++ b/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/strategy/direct/AlipayDirectSyncStrategy.java @@ -3,10 +3,10 @@ package cn.daxpay.open.channel.alipay.strategy.direct; import cn.daxpay.open.channel.alipay.client.credential.AlipaySdkCredential; import cn.daxpay.open.channel.alipay.service.direct.AlipayDirectConfigAssembler; import cn.daxpay.open.channel.alipay.service.payment.sync.AlipaySyncService; -import cn.daxpay.open.payment.strategy.pay.PayStrategyContext; -import cn.daxpay.open.payment.pay.bo.PaySyncResultBo; -import cn.daxpay.open.payment.pay.order.entity.NormalPayOrder; -import cn.daxpay.open.payment.strategy.sync.AbsSyncPayOrderStrategy; +import cn.daxpay.open.payment.core.strategy.pay.PayStrategyContext; +import cn.daxpay.open.payment.core.trade.bo.PaySyncResultBo; +import cn.daxpay.open.payment.core.trade.entity.NormalPayOrder; +import cn.daxpay.open.payment.core.strategy.sync.AbsSyncPayOrderStrategy; import cn.daxpay.open.platform.core.enums.pay.channel.ProductEnum; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/strategy/isv/AlipayIsvCloseStrategy.java b/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/strategy/isv/AlipayIsvCloseStrategy.java index 3e7dc861f..e80b42e9a 100644 --- a/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/strategy/isv/AlipayIsvCloseStrategy.java +++ b/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/strategy/isv/AlipayIsvCloseStrategy.java @@ -3,9 +3,9 @@ package cn.daxpay.open.channel.alipay.strategy.isv; import cn.daxpay.open.channel.alipay.client.credential.AlipaySdkCredential; import cn.daxpay.open.channel.alipay.service.isv.AlipayIsvConfigAssembler; import cn.daxpay.open.channel.alipay.service.payment.close.AlipayCloseService; -import cn.daxpay.open.payment.strategy.pay.PayStrategyContext; -import cn.daxpay.open.payment.pay.order.entity.PayTrade; -import cn.daxpay.open.payment.strategy.pay.AbsPayCloseStrategy; +import cn.daxpay.open.payment.core.strategy.pay.PayStrategyContext; +import cn.daxpay.open.payment.core.trade.entity.PayTrade; +import cn.daxpay.open.payment.core.strategy.pay.AbsPayCloseStrategy; import cn.daxpay.open.platform.core.enums.pay.pay.CloseTypeEnum; import cn.daxpay.open.platform.core.enums.pay.channel.ProductEnum; import lombok.RequiredArgsConstructor; diff --git a/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/strategy/isv/AlipayIsvPayStrategy.java b/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/strategy/isv/AlipayIsvPayStrategy.java index c9413cf73..a18e89f6d 100644 --- a/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/strategy/isv/AlipayIsvPayStrategy.java +++ b/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/strategy/isv/AlipayIsvPayStrategy.java @@ -3,9 +3,9 @@ package cn.daxpay.open.channel.alipay.strategy.isv; import cn.daxpay.open.channel.alipay.client.credential.AlipaySdkCredential; import cn.daxpay.open.channel.alipay.service.isv.AlipayIsvConfigAssembler; import cn.daxpay.open.channel.alipay.service.payment.pay.AlipayPayService; -import cn.daxpay.open.payment.strategy.pay.PayStrategyContext; -import cn.daxpay.open.payment.pay.bo.PayTradeResultBo; -import cn.daxpay.open.payment.strategy.pay.AbsNormalPayStrategy; +import cn.daxpay.open.payment.core.strategy.pay.PayStrategyContext; +import cn.daxpay.open.payment.core.trade.bo.PayTradeResultBo; +import cn.daxpay.open.payment.core.strategy.pay.AbsNormalPayStrategy; import cn.daxpay.open.platform.core.enums.pay.channel.ProductEnum; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/strategy/isv/AlipayIsvProductStrategy.java b/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/strategy/isv/AlipayIsvProductStrategy.java index 87de447b9..71f286bb3 100644 --- a/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/strategy/isv/AlipayIsvProductStrategy.java +++ b/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/strategy/isv/AlipayIsvProductStrategy.java @@ -6,7 +6,7 @@ import cn.daxpay.open.platform.core.enums.pay.channel.PayCapabilityEnum; import cn.daxpay.open.platform.core.enums.pay.channel.PayMethodEnum; import cn.daxpay.open.platform.core.enums.pay.channel.PayProviderEnum; import cn.daxpay.open.platform.core.enums.pay.channel.ProductEnum; -import cn.daxpay.open.payment.strategy.product.AbsProductStrategy; +import cn.daxpay.open.payment.core.strategy.product.AbsProductStrategy; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/strategy/isv/AlipayIsvSyncStrategy.java b/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/strategy/isv/AlipayIsvSyncStrategy.java index 874693510..cd6d1eb41 100644 --- a/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/strategy/isv/AlipayIsvSyncStrategy.java +++ b/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/strategy/isv/AlipayIsvSyncStrategy.java @@ -3,10 +3,10 @@ package cn.daxpay.open.channel.alipay.strategy.isv; import cn.daxpay.open.channel.alipay.client.credential.AlipaySdkCredential; import cn.daxpay.open.channel.alipay.service.isv.AlipayIsvConfigAssembler; import cn.daxpay.open.channel.alipay.service.payment.sync.AlipaySyncService; -import cn.daxpay.open.payment.strategy.pay.PayStrategyContext; -import cn.daxpay.open.payment.pay.bo.PaySyncResultBo; -import cn.daxpay.open.payment.pay.order.entity.PayTrade; -import cn.daxpay.open.payment.strategy.sync.AbsSyncPayOrderStrategy; +import cn.daxpay.open.payment.core.strategy.pay.PayStrategyContext; +import cn.daxpay.open.payment.core.trade.bo.PaySyncResultBo; +import cn.daxpay.open.payment.core.trade.entity.PayTrade; +import cn.daxpay.open.payment.core.strategy.sync.AbsSyncPayOrderStrategy; import cn.daxpay.open.platform.core.enums.pay.channel.ProductEnum; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; 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 a89047459..de0d573d6 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 @@ -15,7 +15,7 @@ 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.strategy.product.AbsProductStrategy; +import cn.daxpay.open.payment.core.strategy.product.AbsProductStrategy; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import lombok.RequiredArgsConstructor; diff --git a/daxpay-channel/daxpay-channel-douyin/src/main/java/cn/daxpay/open/channel/douyin/strategy/DouyinDirectPayStrategy.java b/daxpay-channel/daxpay-channel-douyin/src/main/java/cn/daxpay/open/channel/douyin/strategy/DouyinDirectPayStrategy.java index 03b9d112b..6ffff93b9 100644 --- a/daxpay-channel/daxpay-channel-douyin/src/main/java/cn/daxpay/open/channel/douyin/strategy/DouyinDirectPayStrategy.java +++ b/daxpay-channel/daxpay-channel-douyin/src/main/java/cn/daxpay/open/channel/douyin/strategy/DouyinDirectPayStrategy.java @@ -3,10 +3,10 @@ package cn.daxpay.open.channel.douyin.strategy; import cn.daxpay.open.channel.douyin.client.DouyinChannelClient; import cn.daxpay.open.channel.douyin.dto.DouyinPayReq; import cn.daxpay.open.channel.douyin.dto.DouyinPayResp; -import cn.daxpay.open.payment.strategy.pay.PayStrategyContext; +import cn.daxpay.open.payment.core.strategy.pay.PayStrategyContext; import cn.daxpay.open.payment.common.result.DaxResult; -import cn.daxpay.open.payment.pay.bo.PayTradeResultBo; -import cn.daxpay.open.payment.strategy.pay.AbsNormalPayStrategy; +import cn.daxpay.open.payment.core.trade.bo.PayTradeResultBo; +import cn.daxpay.open.payment.core.strategy.pay.AbsNormalPayStrategy; import cn.daxpay.open.platform.core.enums.pay.channel.ProductEnum; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/daxpay-channel/daxpay-channel-douyin/src/main/java/cn/daxpay/open/channel/douyin/strategy/DouyinPayProductStrategy.java b/daxpay-channel/daxpay-channel-douyin/src/main/java/cn/daxpay/open/channel/douyin/strategy/DouyinPayProductStrategy.java index 0108fa8a3..4ac4f6de0 100644 --- a/daxpay-channel/daxpay-channel-douyin/src/main/java/cn/daxpay/open/channel/douyin/strategy/DouyinPayProductStrategy.java +++ b/daxpay-channel/daxpay-channel-douyin/src/main/java/cn/daxpay/open/channel/douyin/strategy/DouyinPayProductStrategy.java @@ -6,7 +6,7 @@ import cn.daxpay.open.platform.core.enums.pay.channel.PayCapabilityEnum; import cn.daxpay.open.platform.core.enums.pay.channel.PayMethodEnum; import cn.daxpay.open.platform.core.enums.pay.channel.PayProviderEnum; import cn.daxpay.open.platform.core.enums.pay.channel.ProductEnum; -import cn.daxpay.open.payment.strategy.product.AbsProductStrategy; +import cn.daxpay.open.payment.core.strategy.product.AbsProductStrategy; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/daxpay-channel/daxpay-channel-lakala/src/main/java/cn/daxpay/open/channel/lakala/strategy/LakalaProductStrategy.java b/daxpay-channel/daxpay-channel-lakala/src/main/java/cn/daxpay/open/channel/lakala/strategy/LakalaProductStrategy.java index f0605dbbf..519b6ceec 100644 --- a/daxpay-channel/daxpay-channel-lakala/src/main/java/cn/daxpay/open/channel/lakala/strategy/LakalaProductStrategy.java +++ b/daxpay-channel/daxpay-channel-lakala/src/main/java/cn/daxpay/open/channel/lakala/strategy/LakalaProductStrategy.java @@ -6,7 +6,7 @@ import cn.daxpay.open.platform.core.enums.pay.channel.PayCapabilityEnum; import cn.daxpay.open.platform.core.enums.pay.channel.PayMethodEnum; import cn.daxpay.open.platform.core.enums.pay.channel.PayProviderEnum; import cn.daxpay.open.platform.core.enums.pay.channel.ProductEnum; -import cn.daxpay.open.payment.strategy.product.AbsProductStrategy; +import cn.daxpay.open.payment.core.strategy.product.AbsProductStrategy; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/daxpay-channel/daxpay-channel-ums/src/main/java/cn/daxpay/open/channel/ums/strategy/UmsAppProductStrategy.java b/daxpay-channel/daxpay-channel-ums/src/main/java/cn/daxpay/open/channel/ums/strategy/UmsAppProductStrategy.java index 018cd9ee7..ae6718646 100644 --- a/daxpay-channel/daxpay-channel-ums/src/main/java/cn/daxpay/open/channel/ums/strategy/UmsAppProductStrategy.java +++ b/daxpay-channel/daxpay-channel-ums/src/main/java/cn/daxpay/open/channel/ums/strategy/UmsAppProductStrategy.java @@ -4,7 +4,7 @@ import cn.daxpay.open.platform.core.enums.pay.channel.PayCapabilityEnum; import cn.daxpay.open.platform.core.enums.pay.channel.PayMethodEnum; import cn.daxpay.open.platform.core.enums.pay.channel.PayProviderEnum; import cn.daxpay.open.platform.core.enums.pay.channel.ProductEnum; -import cn.daxpay.open.payment.strategy.product.AbsProductStrategy; +import cn.daxpay.open.payment.core.strategy.product.AbsProductStrategy; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/daxpay-channel/daxpay-channel-ums/src/main/java/cn/daxpay/open/channel/ums/strategy/UmsBarcodeProductStrategy.java b/daxpay-channel/daxpay-channel-ums/src/main/java/cn/daxpay/open/channel/ums/strategy/UmsBarcodeProductStrategy.java index 5ad9c3c39..5472d759d 100644 --- a/daxpay-channel/daxpay-channel-ums/src/main/java/cn/daxpay/open/channel/ums/strategy/UmsBarcodeProductStrategy.java +++ b/daxpay-channel/daxpay-channel-ums/src/main/java/cn/daxpay/open/channel/ums/strategy/UmsBarcodeProductStrategy.java @@ -4,7 +4,7 @@ import cn.daxpay.open.platform.core.enums.pay.channel.PayCapabilityEnum; import cn.daxpay.open.platform.core.enums.pay.channel.PayMethodEnum; import cn.daxpay.open.platform.core.enums.pay.channel.PayProviderEnum; import cn.daxpay.open.platform.core.enums.pay.channel.ProductEnum; -import cn.daxpay.open.payment.strategy.product.AbsProductStrategy; +import cn.daxpay.open.payment.core.strategy.product.AbsProductStrategy; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/daxpay-channel/daxpay-channel-ums/src/main/java/cn/daxpay/open/channel/ums/strategy/UmsH5ProductStrategy.java b/daxpay-channel/daxpay-channel-ums/src/main/java/cn/daxpay/open/channel/ums/strategy/UmsH5ProductStrategy.java index b0c971a71..900169594 100644 --- a/daxpay-channel/daxpay-channel-ums/src/main/java/cn/daxpay/open/channel/ums/strategy/UmsH5ProductStrategy.java +++ b/daxpay-channel/daxpay-channel-ums/src/main/java/cn/daxpay/open/channel/ums/strategy/UmsH5ProductStrategy.java @@ -4,7 +4,7 @@ import cn.daxpay.open.platform.core.enums.pay.channel.PayCapabilityEnum; import cn.daxpay.open.platform.core.enums.pay.channel.PayMethodEnum; import cn.daxpay.open.platform.core.enums.pay.channel.PayProviderEnum; import cn.daxpay.open.platform.core.enums.pay.channel.ProductEnum; -import cn.daxpay.open.payment.strategy.product.AbsProductStrategy; +import cn.daxpay.open.payment.core.strategy.product.AbsProductStrategy; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/daxpay-channel/daxpay-channel-ums/src/main/java/cn/daxpay/open/channel/ums/strategy/UmsJsapiProductStrategy.java b/daxpay-channel/daxpay-channel-ums/src/main/java/cn/daxpay/open/channel/ums/strategy/UmsJsapiProductStrategy.java index 0de4fcac0..fb963a3d4 100644 --- a/daxpay-channel/daxpay-channel-ums/src/main/java/cn/daxpay/open/channel/ums/strategy/UmsJsapiProductStrategy.java +++ b/daxpay-channel/daxpay-channel-ums/src/main/java/cn/daxpay/open/channel/ums/strategy/UmsJsapiProductStrategy.java @@ -4,7 +4,7 @@ import cn.daxpay.open.platform.core.enums.pay.channel.PayCapabilityEnum; import cn.daxpay.open.platform.core.enums.pay.channel.PayMethodEnum; import cn.daxpay.open.platform.core.enums.pay.channel.PayProviderEnum; import cn.daxpay.open.platform.core.enums.pay.channel.ProductEnum; -import cn.daxpay.open.payment.strategy.product.AbsProductStrategy; +import cn.daxpay.open.payment.core.strategy.product.AbsProductStrategy; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/daxpay-channel/daxpay-channel-ums/src/main/java/cn/daxpay/open/channel/ums/strategy/UmsMiniProductStrategy.java b/daxpay-channel/daxpay-channel-ums/src/main/java/cn/daxpay/open/channel/ums/strategy/UmsMiniProductStrategy.java index af5782c74..43c6b74d6 100644 --- a/daxpay-channel/daxpay-channel-ums/src/main/java/cn/daxpay/open/channel/ums/strategy/UmsMiniProductStrategy.java +++ b/daxpay-channel/daxpay-channel-ums/src/main/java/cn/daxpay/open/channel/ums/strategy/UmsMiniProductStrategy.java @@ -4,7 +4,7 @@ import cn.daxpay.open.platform.core.enums.pay.channel.PayCapabilityEnum; import cn.daxpay.open.platform.core.enums.pay.channel.PayMethodEnum; import cn.daxpay.open.platform.core.enums.pay.channel.PayProviderEnum; import cn.daxpay.open.platform.core.enums.pay.channel.ProductEnum; -import cn.daxpay.open.payment.strategy.product.AbsProductStrategy; +import cn.daxpay.open.payment.core.strategy.product.AbsProductStrategy; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/daxpay-channel/daxpay-channel-ums/src/main/java/cn/daxpay/open/channel/ums/strategy/UmsQrcodeProductStrategy.java b/daxpay-channel/daxpay-channel-ums/src/main/java/cn/daxpay/open/channel/ums/strategy/UmsQrcodeProductStrategy.java index 6964b4ed8..8757fd387 100644 --- a/daxpay-channel/daxpay-channel-ums/src/main/java/cn/daxpay/open/channel/ums/strategy/UmsQrcodeProductStrategy.java +++ b/daxpay-channel/daxpay-channel-ums/src/main/java/cn/daxpay/open/channel/ums/strategy/UmsQrcodeProductStrategy.java @@ -4,7 +4,7 @@ import cn.daxpay.open.platform.core.enums.pay.channel.PayCapabilityEnum; import cn.daxpay.open.platform.core.enums.pay.channel.PayMethodEnum; import cn.daxpay.open.platform.core.enums.pay.channel.PayProviderEnum; import cn.daxpay.open.platform.core.enums.pay.channel.ProductEnum; -import cn.daxpay.open.payment.strategy.product.AbsProductStrategy; +import cn.daxpay.open.payment.core.strategy.product.AbsProductStrategy; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; 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 1b6c2029e..94c0f241a 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 @@ -15,7 +15,7 @@ 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.strategy.product.AbsProductStrategy; +import cn.daxpay.open.payment.core.strategy.product.AbsProductStrategy; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import lombok.RequiredArgsConstructor; 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 945133f24..dc00598e6 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 @@ -15,7 +15,7 @@ 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.strategy.product.AbsProductStrategy; +import cn.daxpay.open.payment.core.strategy.product.AbsProductStrategy; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import lombok.RequiredArgsConstructor; diff --git a/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/strategy/WechatDirectProductStrategy.java b/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/strategy/WechatDirectProductStrategy.java index 59e090785..c1a93d7ea 100644 --- a/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/strategy/WechatDirectProductStrategy.java +++ b/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/strategy/WechatDirectProductStrategy.java @@ -6,7 +6,7 @@ import cn.daxpay.open.platform.core.enums.pay.channel.PayCapabilityEnum; import cn.daxpay.open.platform.core.enums.pay.channel.PayMethodEnum; import cn.daxpay.open.platform.core.enums.pay.channel.PayProviderEnum; import cn.daxpay.open.platform.core.enums.pay.channel.ProductEnum; -import cn.daxpay.open.payment.strategy.product.AbsProductStrategy; +import cn.daxpay.open.payment.core.strategy.product.AbsProductStrategy; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/strategy/WechatIsvProductStrategy.java b/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/strategy/WechatIsvProductStrategy.java index 5d1babe6c..0757ed564 100644 --- a/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/strategy/WechatIsvProductStrategy.java +++ b/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/strategy/WechatIsvProductStrategy.java @@ -6,7 +6,7 @@ import cn.daxpay.open.platform.core.enums.pay.channel.PayCapabilityEnum; import cn.daxpay.open.platform.core.enums.pay.channel.PayMethodEnum; import cn.daxpay.open.platform.core.enums.pay.channel.PayProviderEnum; import cn.daxpay.open.platform.core.enums.pay.channel.ProductEnum; -import cn.daxpay.open.payment.strategy.product.AbsProductStrategy; +import cn.daxpay.open.payment.core.strategy.product.AbsProductStrategy; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/order/NormalPayOrderAdminController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/order/NormalPayOrderAdminController.java index 590a219e4..1757609a0 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/order/NormalPayOrderAdminController.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/order/NormalPayOrderAdminController.java @@ -5,9 +5,9 @@ import cn.daxpay.open.platform.core.rest.Res; import cn.daxpay.open.platform.core.rest.param.PageParam; import cn.daxpay.open.platform.core.rest.result.PageResult; import cn.daxpay.open.platform.core.rest.result.Result; -import cn.daxpay.open.payment.pay.param.order.NormalPayOrderQuery; -import cn.daxpay.open.payment.pay.result.order.NormalPayOrderResult; -import cn.daxpay.open.payment.pay.service.admin.NormalPayOrderAdminService; +import cn.daxpay.open.payment.core.trade.param.NormalPayOrderQuery; +import cn.daxpay.open.payment.core.trade.result.NormalPayOrderResult; +import cn.daxpay.open.payment.core.trade.service.admin.NormalPayOrderAdminService; import cn.daxpay.open.payment.unipay.result.trade.pay.NormalPaySyncResult; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/order/PayTradeAdminController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/order/PayTradeAdminController.java index 29ff641ca..1f2eb429f 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/order/PayTradeAdminController.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/order/PayTradeAdminController.java @@ -5,9 +5,9 @@ import cn.daxpay.open.platform.core.rest.Res; import cn.daxpay.open.platform.core.rest.param.PageParam; import cn.daxpay.open.platform.core.rest.result.PageResult; import cn.daxpay.open.platform.core.rest.result.Result; -import cn.daxpay.open.payment.pay.param.order.PayTradeQuery; -import cn.daxpay.open.payment.pay.result.order.PayTradeResult; -import cn.daxpay.open.payment.pay.service.admin.PayTradeAdminService; +import cn.daxpay.open.payment.core.trade.param.PayTradeQuery; +import cn.daxpay.open.payment.core.trade.result.PayTradeResult; +import cn.daxpay.open.payment.core.trade.service.admin.PayTradeAdminService; import cn.daxpay.open.payment.unipay.result.trade.pay.NormalPaySyncResult; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/service/develop/DevelopTradeService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/service/develop/DevelopTradeService.java index 99759dc6f..99fbefbde 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/service/develop/DevelopTradeService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/service/develop/DevelopTradeService.java @@ -11,7 +11,7 @@ import cn.daxpay.open.payment.common.util.PaySignUtil; import cn.daxpay.open.payment.masterdata.constants.provider.result.PayProviderMethodResult; import cn.daxpay.open.payment.masterdata.constants.provider.service.PayProviderMethodService; import cn.daxpay.open.payment.merchant.service.route.support.PayRouteStrategyCapabilitySupport; -import cn.daxpay.open.payment.pay.service.NormalPayService; +import cn.daxpay.open.payment.core.trade.service.NormalPayService; import cn.daxpay.open.payment.unipay.param.trade.pay.NormalPayParam; import cn.daxpay.open.payment.unipay.result.trade.pay.NormalPayResult; import cn.daxpay.open.platform.common.config.properties.PlatformConfigProperties; 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/common/util/PaymentStrategyFactory.java index d5ee6ecef..1385af1e1 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/common/util/PaymentStrategyFactory.java @@ -3,7 +3,7 @@ package cn.daxpay.open.payment.common.util; 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.strategy.product.AbsProductStrategy; +import cn.daxpay.open.payment.core.strategy.product.AbsProductStrategy; import cn.daxpay.open.payment.old.pay.support.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/pay/service/route/PayRouteFacade.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/route/PayRouteFacade.java similarity index 91% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/service/route/PayRouteFacade.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/route/PayRouteFacade.java index 9dbc27fa4..df302a37b 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/service/route/PayRouteFacade.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/route/PayRouteFacade.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.pay.service.route; +package cn.daxpay.open.payment.core.route; 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/strategy/auth/AbsChannelAuthStrategy.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/strategy/auth/AbsChannelAuthStrategy.java similarity index 93% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/strategy/auth/AbsChannelAuthStrategy.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/strategy/auth/AbsChannelAuthStrategy.java index 4519a0452..333fed18c 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/strategy/auth/AbsChannelAuthStrategy.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/strategy/auth/AbsChannelAuthStrategy.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.strategy.auth; +package cn.daxpay.open.payment.core.strategy.auth; import cn.daxpay.open.payment.common.strategy.PaymentStrategy; import cn.daxpay.open.payment.unipay.param.assist.AuthCodeParam; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/strategy/pay/AbsNormalPayStrategy.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/strategy/pay/AbsNormalPayStrategy.java similarity index 86% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/strategy/pay/AbsNormalPayStrategy.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/strategy/pay/AbsNormalPayStrategy.java index 439691273..952a4ec2a 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/strategy/pay/AbsNormalPayStrategy.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/strategy/pay/AbsNormalPayStrategy.java @@ -1,7 +1,7 @@ -package cn.daxpay.open.payment.strategy.pay; +package cn.daxpay.open.payment.core.strategy.pay; import cn.daxpay.open.payment.common.strategy.PaymentStrategy; -import cn.daxpay.open.payment.pay.bo.PayTradeResultBo; +import cn.daxpay.open.payment.core.trade.bo.PayTradeResultBo; /// # 抽象普通支付策略基类 /// diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/strategy/pay/AbsPayCloseStrategy.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/strategy/pay/AbsPayCloseStrategy.java similarity index 94% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/strategy/pay/AbsPayCloseStrategy.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/strategy/pay/AbsPayCloseStrategy.java index 4c0d37c5a..9e9cfa00d 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/strategy/pay/AbsPayCloseStrategy.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/strategy/pay/AbsPayCloseStrategy.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.strategy.pay; +package cn.daxpay.open.payment.core.strategy.pay; import cn.daxpay.open.payment.common.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/strategy/pay/PayStrategyContext.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/strategy/pay/PayStrategyContext.java similarity index 87% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/strategy/pay/PayStrategyContext.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/strategy/pay/PayStrategyContext.java index 7d276513a..c8d63451f 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/strategy/pay/PayStrategyContext.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/strategy/pay/PayStrategyContext.java @@ -1,7 +1,7 @@ -package cn.daxpay.open.payment.strategy.pay; +package cn.daxpay.open.payment.core.strategy.pay; -import cn.daxpay.open.payment.pay.order.entity.NormalPayOrder; -import cn.daxpay.open.payment.pay.order.entity.PayTrade; +import cn.daxpay.open.payment.core.trade.entity.NormalPayOrder; +import cn.daxpay.open.payment.core.trade.entity.PayTrade; import cn.daxpay.open.payment.unipay.param.trade.pay.NormalPayParam; import lombok.Getter; import lombok.Setter; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/strategy/product/AbsProductStrategy.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/strategy/product/AbsProductStrategy.java similarity index 96% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/strategy/product/AbsProductStrategy.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/strategy/product/AbsProductStrategy.java index 62b6c724c..923f21b0a 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/strategy/product/AbsProductStrategy.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/strategy/product/AbsProductStrategy.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.strategy.product; +package cn.daxpay.open.payment.core.strategy.product; import cn.daxpay.open.payment.common.strategy.PaymentStrategy; import cn.daxpay.open.platform.core.enums.pay.channel.ChannelApiCallMode; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/strategy/sync/AbsSyncPayOrderStrategy.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/strategy/sync/AbsSyncPayOrderStrategy.java similarity index 73% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/strategy/sync/AbsSyncPayOrderStrategy.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/strategy/sync/AbsSyncPayOrderStrategy.java index 68a44a223..c8b222b9d 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/strategy/sync/AbsSyncPayOrderStrategy.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/strategy/sync/AbsSyncPayOrderStrategy.java @@ -1,8 +1,8 @@ -package cn.daxpay.open.payment.strategy.sync; +package cn.daxpay.open.payment.core.strategy.sync; -import cn.daxpay.open.payment.strategy.pay.PayStrategyContext; +import cn.daxpay.open.payment.core.strategy.pay.PayStrategyContext; import cn.daxpay.open.payment.common.strategy.PaymentStrategy; -import cn.daxpay.open.payment.pay.bo.PaySyncResultBo; +import cn.daxpay.open.payment.core.trade.bo.PaySyncResultBo; /// # 支付同步抽象类 /// diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/bo/PaySyncResultBo.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/bo/PaySyncResultBo.java similarity index 97% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/bo/PaySyncResultBo.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/bo/PaySyncResultBo.java index aa3a6d0ee..7b4e8cd68 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/bo/PaySyncResultBo.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/bo/PaySyncResultBo.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.pay.bo; +package cn.daxpay.open.payment.core.trade.bo; import cn.daxpay.open.payment.common.enums.PayFundStatusEnum; import cn.daxpay.open.platform.core.enums.pay.channel.PayProviderEnum; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/bo/PayTradeResultBo.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/bo/PayTradeResultBo.java similarity index 97% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/bo/PayTradeResultBo.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/bo/PayTradeResultBo.java index 8897030ef..e32bd1f27 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/bo/PayTradeResultBo.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/bo/PayTradeResultBo.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.pay.bo; +package cn.daxpay.open.payment.core.trade.bo; import cn.daxpay.open.platform.core.enums.unipay.PayBodyTypeEnum; import lombok.Data; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/convert/NormalPayOrderConvert.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/convert/NormalPayOrderConvert.java similarity index 75% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/convert/NormalPayOrderConvert.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/convert/NormalPayOrderConvert.java index 5bf2876a1..7929cf8e8 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/convert/NormalPayOrderConvert.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/convert/NormalPayOrderConvert.java @@ -1,7 +1,7 @@ -package cn.daxpay.open.payment.pay.convert; +package cn.daxpay.open.payment.core.trade.convert; -import cn.daxpay.open.payment.pay.order.entity.NormalPayOrder; -import cn.daxpay.open.payment.pay.result.order.NormalPayOrderResult; +import cn.daxpay.open.payment.core.trade.entity.NormalPayOrder; +import cn.daxpay.open.payment.core.trade.result.NormalPayOrderResult; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/convert/PayTradeAdminConvert.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/convert/PayTradeAdminConvert.java similarity index 75% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/convert/PayTradeAdminConvert.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/convert/PayTradeAdminConvert.java index 19e044e19..4cb892637 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/convert/PayTradeAdminConvert.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/convert/PayTradeAdminConvert.java @@ -1,7 +1,7 @@ -package cn.daxpay.open.payment.pay.convert; +package cn.daxpay.open.payment.core.trade.convert; -import cn.daxpay.open.payment.pay.order.entity.PayTrade; -import cn.daxpay.open.payment.pay.result.order.PayTradeResult; +import cn.daxpay.open.payment.core.trade.entity.PayTrade; +import cn.daxpay.open.payment.core.trade.result.PayTradeResult; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/convert/PayTradeConvert.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/convert/PayTradeConvert.java similarity index 82% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/convert/PayTradeConvert.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/convert/PayTradeConvert.java index 7164f83d8..860f31285 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/convert/PayTradeConvert.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/convert/PayTradeConvert.java @@ -1,7 +1,7 @@ -package cn.daxpay.open.payment.pay.convert; +package cn.daxpay.open.payment.core.trade.convert; -import cn.daxpay.open.payment.pay.order.entity.NormalPayOrder; -import cn.daxpay.open.payment.pay.order.entity.PayTrade; +import cn.daxpay.open.payment.core.trade.entity.NormalPayOrder; +import cn.daxpay.open.payment.core.trade.entity.PayTrade; import cn.daxpay.open.payment.unipay.result.trade.pay.NormalPayResult; import org.mapstruct.Mapper; import org.mapstruct.Mapping; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/order/dao/NormalPayOrderManager.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/dao/NormalPayOrderManager.java similarity index 88% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/order/dao/NormalPayOrderManager.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/dao/NormalPayOrderManager.java index 5fbf677a9..433b50c46 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/order/dao/NormalPayOrderManager.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/dao/NormalPayOrderManager.java @@ -1,11 +1,11 @@ -package cn.daxpay.open.payment.pay.order.dao; +package cn.daxpay.open.payment.core.trade.dao; import cn.daxpay.open.platform.common.mybatisplus.impl.BaseManager; import cn.daxpay.open.platform.common.mybatisplus.query.generator.QueryGenerator; import cn.daxpay.open.platform.common.mybatisplus.util.MpUtil; import cn.daxpay.open.platform.core.rest.param.PageParam; -import cn.daxpay.open.payment.pay.order.entity.NormalPayOrder; -import cn.daxpay.open.payment.pay.param.order.NormalPayOrderQuery; +import cn.daxpay.open.payment.core.trade.entity.NormalPayOrder; +import cn.daxpay.open.payment.core.trade.param.NormalPayOrderQuery; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.stereotype.Repository; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/order/dao/NormalPayOrderMapper.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/dao/NormalPayOrderMapper.java similarity index 66% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/order/dao/NormalPayOrderMapper.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/dao/NormalPayOrderMapper.java index 9c53dfb01..5126550c5 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/order/dao/NormalPayOrderMapper.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/dao/NormalPayOrderMapper.java @@ -1,6 +1,6 @@ -package cn.daxpay.open.payment.pay.order.dao; +package cn.daxpay.open.payment.core.trade.dao; -import cn.daxpay.open.payment.pay.order.entity.NormalPayOrder; +import cn.daxpay.open.payment.core.trade.entity.NormalPayOrder; import com.github.yulichang.base.MPJBaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/order/dao/PayTradeManager.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/dao/PayTradeManager.java similarity index 93% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/order/dao/PayTradeManager.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/dao/PayTradeManager.java index e90cada95..3c48ccc3f 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/order/dao/PayTradeManager.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/dao/PayTradeManager.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.pay.order.dao; +package cn.daxpay.open.payment.core.trade.dao; import cn.daxpay.open.platform.common.mybatisplus.impl.BaseManager; import cn.daxpay.open.platform.common.mybatisplus.query.generator.QueryGenerator; @@ -7,8 +7,8 @@ import cn.daxpay.open.platform.core.annotation.IgnoreTenant; import cn.daxpay.open.platform.core.exception.DangerSqlException; import cn.daxpay.open.platform.core.code.CommonCode; import cn.daxpay.open.platform.core.rest.param.PageParam; -import cn.daxpay.open.payment.pay.order.entity.PayTrade; -import cn.daxpay.open.payment.pay.param.order.PayTradeQuery; +import cn.daxpay.open.payment.core.trade.entity.PayTrade; +import cn.daxpay.open.payment.core.trade.param.PayTradeQuery; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.stereotype.Repository; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/order/dao/PayTradeMapper.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/dao/PayTradeMapper.java similarity index 66% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/order/dao/PayTradeMapper.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/dao/PayTradeMapper.java index ea2ed4ac6..8d2ad3268 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/order/dao/PayTradeMapper.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/dao/PayTradeMapper.java @@ -1,6 +1,6 @@ -package cn.daxpay.open.payment.pay.order.dao; +package cn.daxpay.open.payment.core.trade.dao; -import cn.daxpay.open.payment.pay.order.entity.PayTrade; +import cn.daxpay.open.payment.core.trade.entity.PayTrade; import com.github.yulichang.base.MPJBaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/order/entity/NormalPayOrder.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/entity/NormalPayOrder.java similarity index 98% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/order/entity/NormalPayOrder.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/entity/NormalPayOrder.java index 380f58e81..4ae39f666 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/order/entity/NormalPayOrder.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/entity/NormalPayOrder.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.pay.order.entity; +package cn.daxpay.open.payment.core.trade.entity; import cn.daxpay.open.payment.common.entity.merchant.MchBaseEntity; import com.baomidou.mybatisplus.annotation.FieldFill; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/order/entity/PayAuthOrder.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/entity/PayAuthOrder.java similarity index 97% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/order/entity/PayAuthOrder.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/entity/PayAuthOrder.java index 1c6f7a121..bfdad76c8 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/order/entity/PayAuthOrder.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/entity/PayAuthOrder.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.pay.order.entity; +package cn.daxpay.open.payment.core.trade.entity; import cn.daxpay.open.payment.common.entity.merchant.MchBaseEntity; import com.baomidou.mybatisplus.annotation.FieldFill; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/order/entity/PayCombineOrder.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/entity/PayCombineOrder.java similarity index 96% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/order/entity/PayCombineOrder.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/entity/PayCombineOrder.java index d3b626572..207c70744 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/order/entity/PayCombineOrder.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/entity/PayCombineOrder.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.pay.order.entity; +package cn.daxpay.open.payment.core.trade.entity; import cn.daxpay.open.payment.common.entity.merchant.MchBaseEntity; import com.baomidou.mybatisplus.annotation.FieldFill; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/order/entity/PayRecurringOrder.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/entity/PayRecurringOrder.java similarity index 97% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/order/entity/PayRecurringOrder.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/entity/PayRecurringOrder.java index 387bd8f52..d41fa72ad 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/order/entity/PayRecurringOrder.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/entity/PayRecurringOrder.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.pay.order.entity; +package cn.daxpay.open.payment.core.trade.entity; import cn.daxpay.open.payment.common.entity.merchant.MchBaseEntity; import com.baomidou.mybatisplus.annotation.FieldFill; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/order/entity/PayTrade.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/entity/PayTrade.java similarity index 98% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/order/entity/PayTrade.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/entity/PayTrade.java index 5a3fbafbf..ba8c0e7c4 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/order/entity/PayTrade.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/entity/PayTrade.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.pay.order.entity; +package cn.daxpay.open.payment.core.trade.entity; import cn.daxpay.open.payment.common.entity.merchant.MchBaseEntity; import com.baomidou.mybatisplus.annotation.FieldFill; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/param/order/NormalPayOrderQuery.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/param/NormalPayOrderQuery.java similarity index 98% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/param/order/NormalPayOrderQuery.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/param/NormalPayOrderQuery.java index 65f5ce812..e8d21c1d9 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/param/order/NormalPayOrderQuery.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/param/NormalPayOrderQuery.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.pay.param.order; +package cn.daxpay.open.payment.core.trade.param; import cn.daxpay.open.platform.core.annotation.QueryParam; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/param/order/PayTradeQuery.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/param/PayTradeQuery.java similarity index 98% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/param/order/PayTradeQuery.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/param/PayTradeQuery.java index 0c71d7bac..98067f2c7 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/param/order/PayTradeQuery.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/param/PayTradeQuery.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.pay.param.order; +package cn.daxpay.open.payment.core.trade.param; import cn.daxpay.open.platform.core.annotation.QueryParam; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/result/order/NormalPayOrderResult.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/result/NormalPayOrderResult.java similarity index 98% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/result/order/NormalPayOrderResult.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/result/NormalPayOrderResult.java index b1f3c05ea..28780dd0d 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/result/order/NormalPayOrderResult.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/result/NormalPayOrderResult.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.pay.result.order; +package cn.daxpay.open.payment.core.trade.result; import cn.daxpay.open.platform.core.result.BaseResult; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/result/order/PayTradeResult.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/result/PayTradeResult.java similarity index 98% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/result/order/PayTradeResult.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/result/PayTradeResult.java index 974e376f3..377cd3cc5 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/result/order/PayTradeResult.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/result/PayTradeResult.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.pay.result.order; +package cn.daxpay.open.payment.core.trade.result; import cn.daxpay.open.platform.core.result.BaseResult; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/service/NormalPayService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/service/NormalPayService.java similarity index 92% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/service/NormalPayService.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/service/NormalPayService.java index 321dee736..990741ee9 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/service/NormalPayService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/service/NormalPayService.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.pay.service; +package cn.daxpay.open.payment.core.trade.service; import cn.daxpay.open.platform.core.code.CommonErrorCode; import cn.daxpay.open.platform.core.exception.BizInfoException; @@ -6,12 +6,12 @@ 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.pay.bo.PayTradeResultBo; -import cn.daxpay.open.payment.pay.order.dao.PayTradeManager; -import cn.daxpay.open.payment.pay.order.entity.PayTrade; -import cn.daxpay.open.payment.pay.service.route.PayRouteFacade; -import cn.daxpay.open.payment.strategy.pay.AbsNormalPayStrategy; -import cn.daxpay.open.payment.strategy.pay.PayStrategyContext; +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; +import cn.daxpay.open.payment.core.route.PayRouteFacade; +import cn.daxpay.open.payment.core.strategy.pay.AbsNormalPayStrategy; +import cn.daxpay.open.payment.core.strategy.pay.PayStrategyContext; import cn.daxpay.open.payment.unipay.param.trade.pay.NormalPayParam; import cn.daxpay.open.payment.unipay.result.trade.pay.NormalPayResult; import cn.hutool.core.util.StrUtil; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/service/PayAssistService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/service/PayAssistService.java similarity index 93% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/service/PayAssistService.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/service/PayAssistService.java index bde33d193..edd84d902 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/service/PayAssistService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/service/PayAssistService.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.pay.service; +package cn.daxpay.open.payment.core.trade.service; import cn.daxpay.open.platform.core.enums.pay.channel.CurrencyEnum; import cn.daxpay.open.platform.core.enums.pay.channel.ProductEnum; @@ -9,15 +9,14 @@ import cn.daxpay.open.platform.core.util.TradeNoGenerateUtil; import cn.daxpay.open.payment.common.enums.NormalPayOrderStatusEnum; import cn.daxpay.open.payment.common.enums.PayFundStatusEnum; import cn.daxpay.open.payment.common.enums.PayTradeTypeEnum; -import cn.daxpay.open.payment.merchant.service.appinfo.MchAppInfoService; import cn.daxpay.open.payment.common.util.PayUtil; import cn.hutool.core.util.StrUtil; -import cn.daxpay.open.payment.strategy.pay.PayStrategyContext; -import cn.daxpay.open.payment.pay.convert.PayTradeConvert; -import cn.daxpay.open.payment.pay.order.dao.NormalPayOrderManager; -import cn.daxpay.open.payment.pay.order.entity.NormalPayOrder; -import cn.daxpay.open.payment.pay.order.dao.PayTradeManager; -import cn.daxpay.open.payment.pay.order.entity.PayTrade; +import cn.daxpay.open.payment.core.strategy.pay.PayStrategyContext; +import cn.daxpay.open.payment.core.trade.convert.PayTradeConvert; +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; +import cn.daxpay.open.payment.core.trade.entity.PayTrade; import cn.daxpay.open.payment.unipay.param.trade.pay.NormalPayParam; import cn.daxpay.open.payment.unipay.result.trade.pay.NormalPayResult; import lombok.RequiredArgsConstructor; @@ -39,7 +38,6 @@ public class PayAssistService { private final NormalPayOrderManager payNormalOrderManager; private final PayTradeManager payTradeManager; - private final MchAppInfoService mchAppInfoService; /// 创建支付订单（容器 + 资金交易），填充到 context /// 调用方需保证 appId 和 product 已解析完毕 diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/service/PayCallbackService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/service/PayCallbackService.java similarity index 92% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/service/PayCallbackService.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/service/PayCallbackService.java index d9d05f382..8e2d83763 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/service/PayCallbackService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/service/PayCallbackService.java @@ -1,13 +1,13 @@ -package cn.daxpay.open.payment.pay.service; +package cn.daxpay.open.payment.core.trade.service; import cn.daxpay.open.platform.core.enums.pay.notice.CallbackStatusEnum; import cn.daxpay.open.platform.core.exception.system.DataErrorException; import cn.daxpay.open.payment.common.callback.CallbackData; import cn.daxpay.open.payment.common.enums.PayFundStatusEnum; -import cn.daxpay.open.payment.pay.order.dao.NormalPayOrderManager; -import cn.daxpay.open.payment.pay.order.entity.NormalPayOrder; -import cn.daxpay.open.payment.pay.order.dao.PayTradeManager; -import cn.daxpay.open.payment.pay.order.entity.PayTrade; +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; +import cn.daxpay.open.payment.core.trade.entity.PayTrade; import com.baomidou.lock.LockInfo; import com.baomidou.lock.LockTemplate; import lombok.RequiredArgsConstructor; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/service/PayCloseService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/service/PayCloseService.java similarity index 90% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/service/PayCloseService.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/service/PayCloseService.java index 3d9828f2a..012d49870 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/service/PayCloseService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/service/PayCloseService.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.pay.service; +package cn.daxpay.open.payment.core.trade.service; import cn.daxpay.open.platform.core.code.CommonCode; import cn.daxpay.open.platform.core.code.CommonErrorCode; @@ -6,14 +6,14 @@ import cn.daxpay.open.platform.core.code.DaxPayErrorCode; import cn.daxpay.open.platform.core.exception.BizInfoException; import cn.daxpay.open.platform.core.exception.PayFailureException; import cn.daxpay.open.platform.core.exception.operation.OperationFailException; -import cn.daxpay.open.payment.strategy.pay.PayStrategyContext; +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.pay.order.dao.NormalPayOrderManager; -import cn.daxpay.open.payment.pay.order.entity.NormalPayOrder; -import cn.daxpay.open.payment.pay.order.dao.PayTradeManager; -import cn.daxpay.open.payment.pay.order.entity.PayTrade; -import cn.daxpay.open.payment.strategy.pay.AbsPayCloseStrategy; +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; +import cn.daxpay.open.payment.core.trade.entity.PayTrade; +import cn.daxpay.open.payment.core.strategy.pay.AbsPayCloseStrategy; import cn.daxpay.open.payment.unipay.param.trade.pay.NormalPayCloseParam; import cn.daxpay.open.platform.core.enums.pay.pay.CloseTypeEnum; import cn.hutool.core.util.StrUtil; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/service/PaySyncService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/service/PaySyncService.java similarity index 93% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/service/PaySyncService.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/service/PaySyncService.java index abab9b935..fe910e8b6 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/service/PaySyncService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/service/PaySyncService.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.pay.service; +package cn.daxpay.open.payment.core.trade.service; import cn.daxpay.open.platform.core.code.CommonErrorCode; import cn.daxpay.open.platform.core.code.DaxPayErrorCode; @@ -7,15 +7,15 @@ import cn.daxpay.open.platform.core.exception.PayFailureException; import cn.daxpay.open.platform.core.exception.RepetitiveOperationException; import cn.daxpay.open.platform.core.exception.system.SystemUnknownErrorException; import cn.daxpay.open.platform.core.util.DateTimeUtil; -import cn.daxpay.open.payment.strategy.pay.PayStrategyContext; +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.pay.bo.PaySyncResultBo; -import cn.daxpay.open.payment.pay.order.dao.NormalPayOrderManager; -import cn.daxpay.open.payment.pay.order.entity.NormalPayOrder; -import cn.daxpay.open.payment.pay.order.dao.PayTradeManager; -import cn.daxpay.open.payment.pay.order.entity.PayTrade; -import cn.daxpay.open.payment.strategy.sync.AbsSyncPayOrderStrategy; +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; +import cn.daxpay.open.payment.core.trade.dao.PayTradeManager; +import cn.daxpay.open.payment.core.trade.entity.PayTrade; +import cn.daxpay.open.payment.core.strategy.sync.AbsSyncPayOrderStrategy; import cn.daxpay.open.payment.unipay.param.trade.pay.NormalPaySyncParam; import cn.daxpay.open.payment.unipay.result.trade.pay.NormalPaySyncResult; import cn.hutool.core.util.StrUtil; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/service/PayUniHandleService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/service/PayUniHandleService.java similarity index 91% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/service/PayUniHandleService.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/service/PayUniHandleService.java index 624fc566e..7e30b2232 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/service/PayUniHandleService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/service/PayUniHandleService.java @@ -1,11 +1,11 @@ -package cn.daxpay.open.payment.pay.service; +package cn.daxpay.open.payment.core.trade.service; import cn.daxpay.open.payment.common.enums.NormalPayOrderStatusEnum; import cn.daxpay.open.payment.common.enums.PayFundStatusEnum; -import cn.daxpay.open.payment.pay.order.dao.NormalPayOrderManager; -import cn.daxpay.open.payment.pay.order.entity.NormalPayOrder; -import cn.daxpay.open.payment.pay.order.dao.PayTradeManager; -import cn.daxpay.open.payment.pay.order.entity.PayTrade; +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; +import cn.daxpay.open.payment.core.trade.entity.PayTrade; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/service/admin/NormalPayOrderAdminService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/service/admin/NormalPayOrderAdminService.java similarity index 84% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/service/admin/NormalPayOrderAdminService.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/service/admin/NormalPayOrderAdminService.java index bdb11f326..d93329490 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/service/admin/NormalPayOrderAdminService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/service/admin/NormalPayOrderAdminService.java @@ -1,17 +1,17 @@ -package cn.daxpay.open.payment.pay.service.admin; +package cn.daxpay.open.payment.core.trade.service.admin; import cn.daxpay.open.platform.core.exception.DataNotExistException; import cn.daxpay.open.platform.core.rest.param.PageParam; import cn.daxpay.open.platform.core.rest.result.PageResult; -import cn.daxpay.open.payment.pay.convert.NormalPayOrderConvert; -import cn.daxpay.open.payment.pay.order.dao.NormalPayOrderManager; -import cn.daxpay.open.payment.pay.order.dao.PayTradeManager; -import cn.daxpay.open.payment.pay.order.entity.NormalPayOrder; -import cn.daxpay.open.payment.pay.order.entity.PayTrade; -import cn.daxpay.open.payment.pay.param.order.NormalPayOrderQuery; -import cn.daxpay.open.payment.pay.result.order.NormalPayOrderResult; -import cn.daxpay.open.payment.pay.service.PayCloseService; -import cn.daxpay.open.payment.pay.service.PaySyncService; +import cn.daxpay.open.payment.core.trade.convert.NormalPayOrderConvert; +import cn.daxpay.open.payment.core.trade.dao.NormalPayOrderManager; +import cn.daxpay.open.payment.core.trade.dao.PayTradeManager; +import cn.daxpay.open.payment.core.trade.entity.NormalPayOrder; +import cn.daxpay.open.payment.core.trade.entity.PayTrade; +import cn.daxpay.open.payment.core.trade.param.NormalPayOrderQuery; +import cn.daxpay.open.payment.core.trade.result.NormalPayOrderResult; +import cn.daxpay.open.payment.core.trade.service.PayCloseService; +import cn.daxpay.open.payment.core.trade.service.PaySyncService; import cn.daxpay.open.payment.unipay.result.trade.pay.NormalPaySyncResult; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/service/admin/PayTradeAdminService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/service/admin/PayTradeAdminService.java similarity index 82% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/service/admin/PayTradeAdminService.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/service/admin/PayTradeAdminService.java index f8c754d26..847c231d5 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/service/admin/PayTradeAdminService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/service/admin/PayTradeAdminService.java @@ -1,17 +1,17 @@ -package cn.daxpay.open.payment.pay.service.admin; +package cn.daxpay.open.payment.core.trade.service.admin; import cn.daxpay.open.platform.core.exception.DataNotExistException; import cn.daxpay.open.platform.core.rest.param.PageParam; import cn.daxpay.open.platform.core.rest.result.PageResult; -import cn.daxpay.open.payment.pay.convert.PayTradeAdminConvert; -import cn.daxpay.open.payment.pay.order.dao.NormalPayOrderManager; -import cn.daxpay.open.payment.pay.order.dao.PayTradeManager; -import cn.daxpay.open.payment.pay.order.entity.NormalPayOrder; -import cn.daxpay.open.payment.pay.order.entity.PayTrade; -import cn.daxpay.open.payment.pay.param.order.PayTradeQuery; -import cn.daxpay.open.payment.pay.result.order.PayTradeResult; -import cn.daxpay.open.payment.pay.service.PayCloseService; -import cn.daxpay.open.payment.pay.service.PaySyncService; +import cn.daxpay.open.payment.core.trade.convert.PayTradeAdminConvert; +import cn.daxpay.open.payment.core.trade.dao.NormalPayOrderManager; +import cn.daxpay.open.payment.core.trade.dao.PayTradeManager; +import cn.daxpay.open.payment.core.trade.entity.NormalPayOrder; +import cn.daxpay.open.payment.core.trade.entity.PayTrade; +import cn.daxpay.open.payment.core.trade.param.PayTradeQuery; +import cn.daxpay.open.payment.core.trade.result.PayTradeResult; +import cn.daxpay.open.payment.core.trade.service.PayCloseService; +import cn.daxpay.open.payment.core.trade.service.PaySyncService; import cn.daxpay.open.payment.unipay.result.trade.pay.NormalPaySyncResult; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; 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 26df7e7f2..d81ce9e17 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 @@ -7,7 +7,7 @@ import cn.daxpay.open.payment.masterdata.constants.capability.entity.PayCapabili import cn.daxpay.open.payment.masterdata.constants.product.entity.PayProductCapability; 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.strategy.product.AbsProductStrategy; +import cn.daxpay.open.payment.core.strategy.product.AbsProductStrategy; import cn.daxpay.open.payment.old.pay.support.ProductStrategySupport; import cn.daxpay.open.platform.common.i18n.util.I18nUtil; 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/PayProductConfigService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/masterdata/constants/product/service/PayProductConfigService.java index baff65a47..c1955d0dd 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 @@ -6,7 +6,7 @@ import cn.daxpay.open.payment.masterdata.constants.product.entity.PayProduct; import cn.daxpay.open.payment.masterdata.constants.product.entity.PayProductConfig; import cn.daxpay.open.payment.masterdata.constants.product.param.PayProductConfigParam; import cn.daxpay.open.payment.masterdata.constants.product.result.PayProductConfigResult; -import cn.daxpay.open.payment.strategy.product.AbsProductStrategy; +import cn.daxpay.open.payment.core.strategy.product.AbsProductStrategy; import cn.daxpay.open.platform.common.i18n.util.I18nUtil; import cn.daxpay.open.platform.core.enums.pay.channel.ChannelEnum; 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/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 e7f3e4042..c57178030 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 @@ -5,7 +5,7 @@ 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; import cn.daxpay.open.payment.masterdata.constants.product.result.PayProductResult; -import cn.daxpay.open.payment.strategy.product.AbsProductStrategy; +import cn.daxpay.open.payment.core.strategy.product.AbsProductStrategy; import cn.daxpay.open.platform.common.i18n.util.I18nUtil; import cn.daxpay.open.platform.common.mybatisplus.util.MpUtil; import cn.daxpay.open.platform.core.enums.pay.channel.ChannelEnum; 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 2a1c504e3..2c0327a50 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 @@ -12,7 +12,7 @@ import cn.daxpay.open.payment.merchant.param.route.basic.PayRouteBasicConfigBatc import cn.daxpay.open.payment.merchant.param.route.basic.PayRouteBasicConfigItem; import cn.daxpay.open.payment.merchant.result.route.basic.PayRouteBasicConfigResult; import cn.daxpay.open.payment.merchant.service.route.support.PayRouteConfigProviders; -import cn.daxpay.open.payment.strategy.product.AbsProductStrategy; +import cn.daxpay.open.payment.core.strategy.product.AbsProductStrategy; import cn.daxpay.open.platform.core.code.CommonErrorCode; import cn.daxpay.open.platform.core.enums.pay.channel.PayProviderEnum; import cn.daxpay.open.platform.core.exception.BizInfoException; 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 c907a2a39..3307e8574 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 @@ -6,7 +6,7 @@ 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.strategy.product.AbsProductStrategy; +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; 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/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 61434bd07..7a7b7c329 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 @@ -11,8 +11,8 @@ 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.pay.service.route.PayRouteFacade; -import cn.daxpay.open.payment.strategy.product.AbsProductStrategy; +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; import cn.daxpay.open.platform.common.i18n.util.I18nUtil; 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/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 3d1462ea8..2b28761e4 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 @@ -12,7 +12,7 @@ import cn.daxpay.open.payment.masterdata.constants.product.service.PayProductCap 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.strategy.product.AbsProductStrategy; +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; 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/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 93a0fabab..11ac17e83 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 @@ -2,7 +2,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.strategy.auth.AbsChannelAuthStrategy; +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; import cn.daxpay.open.payment.unipay.param.assist.AuthCodeParam; 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 7fd12c90d..0cff4f935 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 @@ -3,7 +3,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.strategy.product.AbsProductStrategy; +import cn.daxpay.open.payment.core.strategy.product.AbsProductStrategy; import cn.daxpay.open.payment.old.pay.support.ProductStrategySupport; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; 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 6d702ef97..4e2264159 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 @@ -8,7 +8,7 @@ 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.pay.order.entity.PayTrade; +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; import cn.daxpay.open.payment.old.pay.entity.record.close.PayCloseRecord; @@ -17,12 +17,12 @@ import cn.daxpay.open.platform.core.enums.pay.pay.PayStatusEnum; import cn.daxpay.open.payment.old.pay.exception.TradeNotExistException; import cn.daxpay.open.payment.old.pay.exception.TradeProcessingException; import cn.daxpay.open.payment.old.pay.exception.TradeStatusErrorException; -import cn.daxpay.open.payment.strategy.pay.PayStrategyContext; +import cn.daxpay.open.payment.core.strategy.pay.PayStrategyContext; import cn.daxpay.open.payment.old.pay.service.notice.MerchantNoticeService; import cn.daxpay.open.payment.old.pay.service.order.pay.PayOrderQueryService; import cn.daxpay.open.payment.old.pay.service.record.close.PayCloseRecordService; import cn.daxpay.open.payment.old.pay.service.trade.TradeUniHandleService; -import cn.daxpay.open.payment.strategy.pay.AbsPayCloseStrategy; +import cn.daxpay.open.payment.core.strategy.pay.AbsPayCloseStrategy; import cn.daxpay.open.payment.unipay.param.trade.pay.NormalPayCloseParam; import cn.hutool.core.util.StrUtil; import com.baomidou.lock.LockInfo; 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 46c188add..bd4bc9c22 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 @@ -20,14 +20,14 @@ import cn.daxpay.open.platform.core.enums.pay.pay.PayStatusEnum; import cn.daxpay.open.platform.core.enums.pay.trade.TradeTypeEnum; import cn.daxpay.open.payment.old.pay.exception.TradeNotExistException; import cn.daxpay.open.payment.old.pay.exception.TradeStatusErrorException; -import cn.daxpay.open.payment.strategy.pay.PayStrategyContext; +import cn.daxpay.open.payment.core.strategy.pay.PayStrategyContext; import cn.daxpay.open.payment.old.pay.service.order.pay.PayOrderQueryService; import cn.daxpay.open.payment.old.pay.service.record.sync.TradeSyncRecordService; import cn.daxpay.open.payment.old.pay.service.trade.TradeUniHandleService; import cn.daxpay.open.payment.common.enums.PayFundStatusEnum; -import cn.daxpay.open.payment.pay.order.entity.PayTrade; -import cn.daxpay.open.payment.strategy.pay.AbsPayCloseStrategy; -import cn.daxpay.open.payment.strategy.sync.AbsSyncPayOrderStrategy; +import cn.daxpay.open.payment.core.trade.entity.PayTrade; +import cn.daxpay.open.payment.core.strategy.pay.AbsPayCloseStrategy; +import cn.daxpay.open.payment.core.strategy.sync.AbsSyncPayOrderStrategy; import cn.daxpay.open.payment.unipay.param.trade.pay.NormalPaySyncParam; import cn.daxpay.open.payment.unipay.result.trade.pay.NormalPaySyncResult; import cn.hutool.core.util.StrUtil; 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/old/pay/support/ProductStrategySupport.java index 9fe57cbf3..f77063161 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/old/pay/support/ProductStrategySupport.java @@ -1,6 +1,6 @@ package cn.daxpay.open.payment.old.pay.support; -import cn.daxpay.open.payment.strategy.product.AbsProductStrategy; +import cn.daxpay.open.payment.core.strategy.product.AbsProductStrategy; import cn.daxpay.open.platform.core.enums.pay.channel.PayCapabilityEnum; import cn.daxpay.open.platform.core.enums.pay.channel.PayMethodEnum; import cn.daxpay.open.platform.core.enums.pay.channel.PayProviderEnum; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/unipay/controller/UniTradeController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/unipay/controller/UniTradeController.java index 6a5035f30..73479647b 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/unipay/controller/UniTradeController.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/unipay/controller/UniTradeController.java @@ -8,8 +8,8 @@ import cn.daxpay.open.payment.common.result.DaxResult; import cn.daxpay.open.payment.common.util.DaxRes; import cn.daxpay.open.payment.merchant.service.permission.MerchantPermissionService; import cn.daxpay.open.payment.common.aop.PaymentVerify; -import cn.daxpay.open.payment.pay.service.PayCloseService; -import cn.daxpay.open.payment.pay.service.NormalPayService; +import cn.daxpay.open.payment.core.trade.service.PayCloseService; +import cn.daxpay.open.payment.core.trade.service.NormalPayService; import cn.daxpay.open.payment.unipay.param.trade.pay.NormalPayCloseParam; import cn.daxpay.open.payment.unipay.param.trade.pay.NormalPayParam; import cn.daxpay.open.payment.unipay.result.trade.pay.NormalPayResult;