From 1b9a45003c95b216921a4a099525ca38edac1cf2 Mon Sep 17 00:00:00 2001 From: DaxPay Dev Date: Mon, 13 Jul 2026 15:50:10 +0800 Subject: [PATCH] =?UTF-8?q?refactor(channel):=20=E5=8E=BB=E6=8E=89=20Chann?= =?UTF-8?q?elMerchant=20=E5=86=97=E4=BD=99=E5=AD=90=E5=8C=85=20mch/info?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将 entity/dao/param 的 mch 与 result/service 的 info 统一拍平到 channel 包下，并同步各通道与管理端的 import。 --- .../direct/AdapayDirectChannelMerchantService.java | 4 ++-- .../service/direct/AdapayDirectConfigAssembler.java | 4 ++-- .../service/direct/AdapayDirectKeyConfigService.java | 2 +- .../direct/AlipayDirectChannelMerchantService.java | 4 ++-- .../service/isv/AlipayIsvChannelMerchantService.java | 4 ++-- .../isv/DougongIsvChannelMerchantService.java | 4 ++-- .../direct/DouyinDirectChannelMerchantService.java | 4 ++-- .../service/isv/FuyouIsvChannelMerchantService.java | 4 ++-- .../service/isv/HkrtIsvChannelMerchantService.java | 4 ++-- .../service/isv/HmpayIsvChannelMerchantService.java | 4 ++-- .../service/isv/LakalaIsvChannelMerchantService.java | 4 ++-- .../service/isv/LeshuaIsvChannelMerchantService.java | 4 ++-- .../direct/UmsDirectChannelMerchantService.java | 4 ++-- .../ums/service/direct/UmsDirectConfigAssembler.java | 4 ++-- .../service/direct/UmsDirectKeyConfigService.java | 2 +- .../service/isv/VbillIsvChannelMerchantService.java | 4 ++-- .../direct/WechatDirectChannelMerchantService.java | 4 ++-- .../service/isv/WechatIsvChannelMerchantService.java | 4 ++-- .../direct/YeepayDirectChannelMerchantService.java | 4 ++-- .../service/direct/YeepayDirectConfigAssembler.java | 4 ++-- .../service/direct/YeepayDirectKeyConfigService.java | 2 +- .../channel/ChannelMerchantAdminController.java | 8 ++++---- .../MerchantChannelMerchantAdminController.java | 8 ++++---- .../channel/AppAdminChannelMerchantController.java | 6 +++--- .../channel/AppAdminChannelMerchantService.java | 8 ++++---- .../channel/convert/ChannelMerchantConvert.java | 6 +++--- .../dao/{mch => }/ChannelMerchantManager.java | 6 +++--- .../channel/dao/{mch => }/ChannelMerchantMapper.java | 4 ++-- .../channel/entity/{mch => }/ChannelMerchant.java | 4 ++-- .../param/{mch => }/ChannelMerchantEditParam.java | 2 +- .../param/{mch => }/ChannelMerchantGenParam.java | 2 +- .../param/{mch => }/ChannelMerchantQuery.java | 2 +- .../result/{info => }/ChannelMerchantResult.java | 2 +- .../service/{info => }/ChannelMerchantService.java | 12 ++++++------ .../open/payment/core/assist/ChannelAuthService.java | 4 ++-- .../route/basic/PayRouteBasicConfigService.java | 4 ++-- .../route/runtime/PayRouteProductResolver.java | 4 ++-- .../route/scene/PayRouteSceneConfigService.java | 4 ++-- .../support/PayRouteStrategyCapabilitySupport.java | 4 ++-- 39 files changed, 84 insertions(+), 84 deletions(-) rename daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/dao/{mch => }/ChannelMerchantManager.java (93%) rename daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/dao/{mch => }/ChannelMerchantMapper.java (65%) rename daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/entity/{mch => }/ChannelMerchant.java (92%) rename daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/param/{mch => }/ChannelMerchantEditParam.java (92%) rename daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/param/{mch => }/ChannelMerchantGenParam.java (89%) rename daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/param/{mch => }/ChannelMerchantQuery.java (94%) rename daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/result/{info => }/ChannelMerchantResult.java (96%) rename daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/service/{info => }/ChannelMerchantService.java (93%) diff --git a/daxpay-channel/daxpay-channel-adapay/src/main/java/cn/daxpay/open/channel/adapay/service/direct/AdapayDirectChannelMerchantService.java b/daxpay-channel/daxpay-channel-adapay/src/main/java/cn/daxpay/open/channel/adapay/service/direct/AdapayDirectChannelMerchantService.java index 000d93659..6648945f7 100644 --- a/daxpay-channel/daxpay-channel-adapay/src/main/java/cn/daxpay/open/channel/adapay/service/direct/AdapayDirectChannelMerchantService.java +++ b/daxpay-channel/daxpay-channel-adapay/src/main/java/cn/daxpay/open/channel/adapay/service/direct/AdapayDirectChannelMerchantService.java @@ -3,8 +3,8 @@ package cn.daxpay.open.channel.adapay.service.direct; import cn.daxpay.open.channel.adapay.dao.direct.AdapayDirectKeyConfigManager; import cn.daxpay.open.channel.adapay.entity.direct.AdapayDirectKeyConfig; import cn.daxpay.open.channel.adapay.param.direct.AdapayDirectChannelMerchantCreateParam; -import cn.daxpay.open.payment.channel.dao.mch.ChannelMerchantManager; -import cn.daxpay.open.payment.channel.entity.mch.ChannelMerchant; +import cn.daxpay.open.payment.channel.dao.ChannelMerchantManager; +import cn.daxpay.open.payment.channel.entity.ChannelMerchant; import cn.daxpay.open.platform.core.enums.channel.ChannelMerchantSourceEnum; import cn.daxpay.open.platform.core.util.ChannelMchNoGenerateUtil; import lombok.RequiredArgsConstructor; diff --git a/daxpay-channel/daxpay-channel-adapay/src/main/java/cn/daxpay/open/channel/adapay/service/direct/AdapayDirectConfigAssembler.java b/daxpay-channel/daxpay-channel-adapay/src/main/java/cn/daxpay/open/channel/adapay/service/direct/AdapayDirectConfigAssembler.java index da4ddf033..86abaf9be 100644 --- a/daxpay-channel/daxpay-channel-adapay/src/main/java/cn/daxpay/open/channel/adapay/service/direct/AdapayDirectConfigAssembler.java +++ b/daxpay-channel/daxpay-channel-adapay/src/main/java/cn/daxpay/open/channel/adapay/service/direct/AdapayDirectConfigAssembler.java @@ -2,8 +2,8 @@ package cn.daxpay.open.channel.adapay.service.direct; import cn.daxpay.open.channel.adapay.client.credential.AdapaySdkCredential; import cn.daxpay.open.channel.adapay.entity.direct.AdapayDirectKeyConfig; -import cn.daxpay.open.payment.channel.dao.mch.ChannelMerchantManager; -import cn.daxpay.open.payment.channel.entity.mch.ChannelMerchant; +import cn.daxpay.open.payment.channel.dao.ChannelMerchantManager; +import cn.daxpay.open.payment.channel.entity.ChannelMerchant; import cn.daxpay.open.payment.masterdata.constants.product.dao.PayProductConfigManager; import cn.daxpay.open.payment.masterdata.constants.product.entity.PayProductConfig; import cn.daxpay.open.platform.core.enums.pay.config.PayEnvEnum; diff --git a/daxpay-channel/daxpay-channel-adapay/src/main/java/cn/daxpay/open/channel/adapay/service/direct/AdapayDirectKeyConfigService.java b/daxpay-channel/daxpay-channel-adapay/src/main/java/cn/daxpay/open/channel/adapay/service/direct/AdapayDirectKeyConfigService.java index c042f5e58..36d4d7a3d 100644 --- a/daxpay-channel/daxpay-channel-adapay/src/main/java/cn/daxpay/open/channel/adapay/service/direct/AdapayDirectKeyConfigService.java +++ b/daxpay-channel/daxpay-channel-adapay/src/main/java/cn/daxpay/open/channel/adapay/service/direct/AdapayDirectKeyConfigService.java @@ -4,7 +4,7 @@ import cn.daxpay.open.channel.adapay.convert.direct.AdapayDirectKeyConfigConvert import cn.daxpay.open.channel.adapay.dao.direct.AdapayDirectKeyConfigManager; import cn.daxpay.open.channel.adapay.entity.direct.AdapayDirectKeyConfig; import cn.daxpay.open.channel.adapay.param.direct.AdapayDirectKeyConfigParam; -import cn.daxpay.open.payment.channel.dao.mch.ChannelMerchantManager; +import cn.daxpay.open.payment.channel.dao.ChannelMerchantManager; 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/service/direct/AlipayDirectChannelMerchantService.java b/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/service/direct/AlipayDirectChannelMerchantService.java index 6cc023d83..a3700eaa9 100644 --- a/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/service/direct/AlipayDirectChannelMerchantService.java +++ b/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/service/direct/AlipayDirectChannelMerchantService.java @@ -4,8 +4,8 @@ import cn.daxpay.open.channel.alipay.dao.direct.AlipayDirectChannelMerchantManag import cn.daxpay.open.channel.alipay.entity.direct.AlipayDirectChannelMerchant; import cn.daxpay.open.channel.alipay.param.direct.AlipayDirectChannelMerchantCreateParam; import cn.daxpay.open.channel.alipay.result.direct.AlipayDirectChannelMerchantResult; -import cn.daxpay.open.payment.channel.dao.mch.ChannelMerchantManager; -import cn.daxpay.open.payment.channel.entity.mch.ChannelMerchant; +import cn.daxpay.open.payment.channel.dao.ChannelMerchantManager; +import cn.daxpay.open.payment.channel.entity.ChannelMerchant; import cn.daxpay.open.platform.core.code.CommonErrorCode; import cn.daxpay.open.platform.core.enums.channel.ChannelMerchantSourceEnum; import cn.daxpay.open.platform.core.exception.BizInfoException; diff --git a/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/service/isv/AlipayIsvChannelMerchantService.java b/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/service/isv/AlipayIsvChannelMerchantService.java index e4e5e6f62..781136288 100644 --- a/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/service/isv/AlipayIsvChannelMerchantService.java +++ b/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/service/isv/AlipayIsvChannelMerchantService.java @@ -7,8 +7,8 @@ import cn.daxpay.open.channel.alipay.entity.isv.AlipayIsvChannelMerchant; import cn.daxpay.open.channel.alipay.param.isv.AlipayIsvAppAuthTokenUpdateParam; import cn.daxpay.open.channel.alipay.param.isv.AlipayIsvChannelMerchantCreateParam; import cn.daxpay.open.channel.alipay.result.isv.AlipayIsvChannelMerchantResult; -import cn.daxpay.open.payment.channel.dao.mch.ChannelMerchantManager; -import cn.daxpay.open.payment.channel.entity.mch.ChannelMerchant; +import cn.daxpay.open.payment.channel.dao.ChannelMerchantManager; +import cn.daxpay.open.payment.channel.entity.ChannelMerchant; import cn.daxpay.open.platform.core.code.CommonErrorCode; import cn.daxpay.open.platform.core.enums.channel.ChannelMerchantSourceEnum; import cn.daxpay.open.platform.core.exception.BizInfoException; diff --git a/daxpay-channel/daxpay-channel-dougong/src/main/java/cn/daxpay/open/channel/dougong/service/isv/DougongIsvChannelMerchantService.java b/daxpay-channel/daxpay-channel-dougong/src/main/java/cn/daxpay/open/channel/dougong/service/isv/DougongIsvChannelMerchantService.java index 01a5e3d7c..602416410 100644 --- a/daxpay-channel/daxpay-channel-dougong/src/main/java/cn/daxpay/open/channel/dougong/service/isv/DougongIsvChannelMerchantService.java +++ b/daxpay-channel/daxpay-channel-dougong/src/main/java/cn/daxpay/open/channel/dougong/service/isv/DougongIsvChannelMerchantService.java @@ -4,8 +4,8 @@ import cn.daxpay.open.channel.dougong.dao.isv.DougongIsvChannelMerchantManager; import cn.daxpay.open.channel.dougong.entity.isv.DougongIsvChannelMerchant; import cn.daxpay.open.channel.dougong.param.isv.DougongIsvChannelMerchantCreateParam; import cn.daxpay.open.channel.dougong.result.isv.DougongIsvChannelMerchantResult; -import cn.daxpay.open.payment.channel.dao.mch.ChannelMerchantManager; -import cn.daxpay.open.payment.channel.entity.mch.ChannelMerchant; +import cn.daxpay.open.payment.channel.dao.ChannelMerchantManager; +import cn.daxpay.open.payment.channel.entity.ChannelMerchant; import cn.daxpay.open.platform.core.code.CommonErrorCode; import cn.daxpay.open.platform.core.enums.channel.ChannelMerchantSourceEnum; import cn.daxpay.open.platform.core.exception.BizInfoException; diff --git a/daxpay-channel/daxpay-channel-douyin/src/main/java/cn/daxpay/open/channel/douyin/service/direct/DouyinDirectChannelMerchantService.java b/daxpay-channel/daxpay-channel-douyin/src/main/java/cn/daxpay/open/channel/douyin/service/direct/DouyinDirectChannelMerchantService.java index 0e8962e00..026f5cf0a 100644 --- a/daxpay-channel/daxpay-channel-douyin/src/main/java/cn/daxpay/open/channel/douyin/service/direct/DouyinDirectChannelMerchantService.java +++ b/daxpay-channel/daxpay-channel-douyin/src/main/java/cn/daxpay/open/channel/douyin/service/direct/DouyinDirectChannelMerchantService.java @@ -4,8 +4,8 @@ import cn.daxpay.open.channel.douyin.dao.direct.DouyinDirectChannelMerchantManag import cn.daxpay.open.channel.douyin.entity.direct.DouyinDirectChannelMerchant; import cn.daxpay.open.channel.douyin.param.direct.DouyinDirectChannelMerchantCreateParam; import cn.daxpay.open.channel.douyin.result.direct.DouyinDirectChannelMerchantResult; -import cn.daxpay.open.payment.channel.dao.mch.ChannelMerchantManager; -import cn.daxpay.open.payment.channel.entity.mch.ChannelMerchant; +import cn.daxpay.open.payment.channel.dao.ChannelMerchantManager; +import cn.daxpay.open.payment.channel.entity.ChannelMerchant; import cn.daxpay.open.platform.core.code.CommonErrorCode; import cn.daxpay.open.platform.core.enums.channel.ChannelMerchantSourceEnum; import cn.daxpay.open.platform.core.exception.BizInfoException; diff --git a/daxpay-channel/daxpay-channel-fuyou/src/main/java/cn/daxpay/open/channel/fuyou/service/isv/FuyouIsvChannelMerchantService.java b/daxpay-channel/daxpay-channel-fuyou/src/main/java/cn/daxpay/open/channel/fuyou/service/isv/FuyouIsvChannelMerchantService.java index 381aa4625..93c630953 100644 --- a/daxpay-channel/daxpay-channel-fuyou/src/main/java/cn/daxpay/open/channel/fuyou/service/isv/FuyouIsvChannelMerchantService.java +++ b/daxpay-channel/daxpay-channel-fuyou/src/main/java/cn/daxpay/open/channel/fuyou/service/isv/FuyouIsvChannelMerchantService.java @@ -4,8 +4,8 @@ import cn.daxpay.open.channel.fuyou.dao.isv.FuyouIsvChannelMerchantManager; import cn.daxpay.open.channel.fuyou.entity.isv.FuyouIsvChannelMerchant; import cn.daxpay.open.channel.fuyou.param.isv.FuyouIsvChannelMerchantCreateParam; import cn.daxpay.open.channel.fuyou.result.isv.FuyouIsvChannelMerchantResult; -import cn.daxpay.open.payment.channel.dao.mch.ChannelMerchantManager; -import cn.daxpay.open.payment.channel.entity.mch.ChannelMerchant; +import cn.daxpay.open.payment.channel.dao.ChannelMerchantManager; +import cn.daxpay.open.payment.channel.entity.ChannelMerchant; import cn.daxpay.open.platform.core.code.CommonErrorCode; import cn.daxpay.open.platform.core.enums.channel.ChannelMerchantSourceEnum; import cn.daxpay.open.platform.core.exception.BizInfoException; diff --git a/daxpay-channel/daxpay-channel-hkrt/src/main/java/cn/daxpay/open/channel/hkrt/service/isv/HkrtIsvChannelMerchantService.java b/daxpay-channel/daxpay-channel-hkrt/src/main/java/cn/daxpay/open/channel/hkrt/service/isv/HkrtIsvChannelMerchantService.java index 8f2716bc9..94a8bff2e 100644 --- a/daxpay-channel/daxpay-channel-hkrt/src/main/java/cn/daxpay/open/channel/hkrt/service/isv/HkrtIsvChannelMerchantService.java +++ b/daxpay-channel/daxpay-channel-hkrt/src/main/java/cn/daxpay/open/channel/hkrt/service/isv/HkrtIsvChannelMerchantService.java @@ -4,8 +4,8 @@ import cn.daxpay.open.channel.hkrt.dao.isv.HkrtIsvChannelMerchantManager; import cn.daxpay.open.channel.hkrt.entity.isv.HkrtIsvChannelMerchant; import cn.daxpay.open.channel.hkrt.param.isv.HkrtIsvChannelMerchantCreateParam; import cn.daxpay.open.channel.hkrt.result.isv.HkrtIsvChannelMerchantResult; -import cn.daxpay.open.payment.channel.dao.mch.ChannelMerchantManager; -import cn.daxpay.open.payment.channel.entity.mch.ChannelMerchant; +import cn.daxpay.open.payment.channel.dao.ChannelMerchantManager; +import cn.daxpay.open.payment.channel.entity.ChannelMerchant; import cn.daxpay.open.platform.core.code.CommonErrorCode; import cn.daxpay.open.platform.core.enums.channel.ChannelMerchantSourceEnum; import cn.daxpay.open.platform.core.exception.BizInfoException; diff --git a/daxpay-channel/daxpay-channel-hmpay/src/main/java/cn/daxpay/open/channel/hmpay/service/isv/HmpayIsvChannelMerchantService.java b/daxpay-channel/daxpay-channel-hmpay/src/main/java/cn/daxpay/open/channel/hmpay/service/isv/HmpayIsvChannelMerchantService.java index c41fbd5aa..b2e780f1d 100644 --- a/daxpay-channel/daxpay-channel-hmpay/src/main/java/cn/daxpay/open/channel/hmpay/service/isv/HmpayIsvChannelMerchantService.java +++ b/daxpay-channel/daxpay-channel-hmpay/src/main/java/cn/daxpay/open/channel/hmpay/service/isv/HmpayIsvChannelMerchantService.java @@ -5,8 +5,8 @@ import cn.daxpay.open.channel.hmpay.entity.isv.HmpayIsvChannelMerchant; import cn.daxpay.open.channel.hmpay.param.isv.HmpayIsvChannelMerchantCreateParam; import cn.daxpay.open.channel.hmpay.param.isv.HmpayIsvChannelMerchantUpdateParam; import cn.daxpay.open.channel.hmpay.result.isv.HmpayIsvChannelMerchantResult; -import cn.daxpay.open.payment.channel.dao.mch.ChannelMerchantManager; -import cn.daxpay.open.payment.channel.entity.mch.ChannelMerchant; +import cn.daxpay.open.payment.channel.dao.ChannelMerchantManager; +import cn.daxpay.open.payment.channel.entity.ChannelMerchant; import cn.daxpay.open.platform.core.code.CommonErrorCode; import cn.daxpay.open.platform.core.enums.channel.ChannelMerchantSourceEnum; import cn.daxpay.open.platform.core.exception.BizInfoException; diff --git a/daxpay-channel/daxpay-channel-lakala/src/main/java/cn/daxpay/open/channel/lakala/service/isv/LakalaIsvChannelMerchantService.java b/daxpay-channel/daxpay-channel-lakala/src/main/java/cn/daxpay/open/channel/lakala/service/isv/LakalaIsvChannelMerchantService.java index 6928418ee..3d61b7454 100644 --- a/daxpay-channel/daxpay-channel-lakala/src/main/java/cn/daxpay/open/channel/lakala/service/isv/LakalaIsvChannelMerchantService.java +++ b/daxpay-channel/daxpay-channel-lakala/src/main/java/cn/daxpay/open/channel/lakala/service/isv/LakalaIsvChannelMerchantService.java @@ -4,8 +4,8 @@ import cn.daxpay.open.channel.lakala.dao.isv.LakalaIsvChannelMerchantManager; import cn.daxpay.open.channel.lakala.entity.isv.LakalaIsvChannelMerchant; import cn.daxpay.open.channel.lakala.param.isv.LakalaIsvChannelMerchantCreateParam; import cn.daxpay.open.channel.lakala.result.isv.LakalaIsvChannelMerchantResult; -import cn.daxpay.open.payment.channel.dao.mch.ChannelMerchantManager; -import cn.daxpay.open.payment.channel.entity.mch.ChannelMerchant; +import cn.daxpay.open.payment.channel.dao.ChannelMerchantManager; +import cn.daxpay.open.payment.channel.entity.ChannelMerchant; import cn.daxpay.open.platform.core.code.CommonErrorCode; import cn.daxpay.open.platform.core.enums.channel.ChannelMerchantSourceEnum; import cn.daxpay.open.platform.core.exception.BizInfoException; diff --git a/daxpay-channel/daxpay-channel-leshua/src/main/java/cn/daxpay/open/channel/leshua/service/isv/LeshuaIsvChannelMerchantService.java b/daxpay-channel/daxpay-channel-leshua/src/main/java/cn/daxpay/open/channel/leshua/service/isv/LeshuaIsvChannelMerchantService.java index 2c6bf4c5c..a8ca04bc5 100644 --- a/daxpay-channel/daxpay-channel-leshua/src/main/java/cn/daxpay/open/channel/leshua/service/isv/LeshuaIsvChannelMerchantService.java +++ b/daxpay-channel/daxpay-channel-leshua/src/main/java/cn/daxpay/open/channel/leshua/service/isv/LeshuaIsvChannelMerchantService.java @@ -4,8 +4,8 @@ import cn.daxpay.open.channel.leshua.dao.isv.LeshuaIsvChannelMerchantManager; import cn.daxpay.open.channel.leshua.entity.isv.LeshuaIsvChannelMerchant; import cn.daxpay.open.channel.leshua.param.isv.LeshuaIsvChannelMerchantCreateParam; import cn.daxpay.open.channel.leshua.result.isv.LeshuaIsvChannelMerchantResult; -import cn.daxpay.open.payment.channel.dao.mch.ChannelMerchantManager; -import cn.daxpay.open.payment.channel.entity.mch.ChannelMerchant; +import cn.daxpay.open.payment.channel.dao.ChannelMerchantManager; +import cn.daxpay.open.payment.channel.entity.ChannelMerchant; import cn.daxpay.open.platform.core.code.CommonErrorCode; import cn.daxpay.open.platform.core.enums.channel.ChannelMerchantSourceEnum; import cn.daxpay.open.platform.core.exception.BizInfoException; diff --git a/daxpay-channel/daxpay-channel-ums/src/main/java/cn/daxpay/open/channel/ums/service/direct/UmsDirectChannelMerchantService.java b/daxpay-channel/daxpay-channel-ums/src/main/java/cn/daxpay/open/channel/ums/service/direct/UmsDirectChannelMerchantService.java index 57af17d0a..e75073dd9 100644 --- a/daxpay-channel/daxpay-channel-ums/src/main/java/cn/daxpay/open/channel/ums/service/direct/UmsDirectChannelMerchantService.java +++ b/daxpay-channel/daxpay-channel-ums/src/main/java/cn/daxpay/open/channel/ums/service/direct/UmsDirectChannelMerchantService.java @@ -3,8 +3,8 @@ package cn.daxpay.open.channel.ums.service.direct; import cn.daxpay.open.channel.ums.dao.direct.UmsDirectKeyConfigManager; import cn.daxpay.open.channel.ums.entity.direct.UmsDirectKeyConfig; import cn.daxpay.open.channel.ums.param.direct.UmsDirectChannelMerchantCreateParam; -import cn.daxpay.open.payment.channel.dao.mch.ChannelMerchantManager; -import cn.daxpay.open.payment.channel.entity.mch.ChannelMerchant; +import cn.daxpay.open.payment.channel.dao.ChannelMerchantManager; +import cn.daxpay.open.payment.channel.entity.ChannelMerchant; import cn.daxpay.open.platform.core.enums.channel.ChannelMerchantSourceEnum; import cn.daxpay.open.platform.core.util.ChannelMchNoGenerateUtil; import lombok.RequiredArgsConstructor; diff --git a/daxpay-channel/daxpay-channel-ums/src/main/java/cn/daxpay/open/channel/ums/service/direct/UmsDirectConfigAssembler.java b/daxpay-channel/daxpay-channel-ums/src/main/java/cn/daxpay/open/channel/ums/service/direct/UmsDirectConfigAssembler.java index 5ef32addc..1d1cee5ad 100644 --- a/daxpay-channel/daxpay-channel-ums/src/main/java/cn/daxpay/open/channel/ums/service/direct/UmsDirectConfigAssembler.java +++ b/daxpay-channel/daxpay-channel-ums/src/main/java/cn/daxpay/open/channel/ums/service/direct/UmsDirectConfigAssembler.java @@ -2,8 +2,8 @@ package cn.daxpay.open.channel.ums.service.direct; import cn.daxpay.open.channel.ums.client.credential.UmsSdkCredential; import cn.daxpay.open.channel.ums.entity.direct.UmsDirectKeyConfig; -import cn.daxpay.open.payment.channel.dao.mch.ChannelMerchantManager; -import cn.daxpay.open.payment.channel.entity.mch.ChannelMerchant; +import cn.daxpay.open.payment.channel.dao.ChannelMerchantManager; +import cn.daxpay.open.payment.channel.entity.ChannelMerchant; import cn.daxpay.open.payment.masterdata.constants.product.dao.PayProductConfigManager; import cn.daxpay.open.payment.masterdata.constants.product.entity.PayProductConfig; import cn.daxpay.open.platform.core.enums.pay.config.PayEnvEnum; diff --git a/daxpay-channel/daxpay-channel-ums/src/main/java/cn/daxpay/open/channel/ums/service/direct/UmsDirectKeyConfigService.java b/daxpay-channel/daxpay-channel-ums/src/main/java/cn/daxpay/open/channel/ums/service/direct/UmsDirectKeyConfigService.java index 3b119f19f..52d5d517a 100644 --- a/daxpay-channel/daxpay-channel-ums/src/main/java/cn/daxpay/open/channel/ums/service/direct/UmsDirectKeyConfigService.java +++ b/daxpay-channel/daxpay-channel-ums/src/main/java/cn/daxpay/open/channel/ums/service/direct/UmsDirectKeyConfigService.java @@ -4,7 +4,7 @@ import cn.daxpay.open.channel.ums.convert.direct.UmsDirectKeyConfigConvert; import cn.daxpay.open.channel.ums.dao.direct.UmsDirectKeyConfigManager; import cn.daxpay.open.channel.ums.entity.direct.UmsDirectKeyConfig; import cn.daxpay.open.channel.ums.param.direct.UmsDirectKeyConfigParam; -import cn.daxpay.open.payment.channel.dao.mch.ChannelMerchantManager; +import cn.daxpay.open.payment.channel.dao.ChannelMerchantManager; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/daxpay-channel/daxpay-channel-vbill/src/main/java/cn/daxpay/open/channel/vbill/service/isv/VbillIsvChannelMerchantService.java b/daxpay-channel/daxpay-channel-vbill/src/main/java/cn/daxpay/open/channel/vbill/service/isv/VbillIsvChannelMerchantService.java index ceef5252f..bf7f8092c 100644 --- a/daxpay-channel/daxpay-channel-vbill/src/main/java/cn/daxpay/open/channel/vbill/service/isv/VbillIsvChannelMerchantService.java +++ b/daxpay-channel/daxpay-channel-vbill/src/main/java/cn/daxpay/open/channel/vbill/service/isv/VbillIsvChannelMerchantService.java @@ -4,8 +4,8 @@ import cn.daxpay.open.channel.vbill.dao.isv.VbillIsvChannelMerchantManager; import cn.daxpay.open.channel.vbill.entity.isv.VbillIsvChannelMerchant; import cn.daxpay.open.channel.vbill.param.isv.VbillIsvChannelMerchantCreateParam; import cn.daxpay.open.channel.vbill.result.isv.VbillIsvChannelMerchantResult; -import cn.daxpay.open.payment.channel.dao.mch.ChannelMerchantManager; -import cn.daxpay.open.payment.channel.entity.mch.ChannelMerchant; +import cn.daxpay.open.payment.channel.dao.ChannelMerchantManager; +import cn.daxpay.open.payment.channel.entity.ChannelMerchant; import cn.daxpay.open.platform.core.code.CommonErrorCode; import cn.daxpay.open.platform.core.enums.channel.ChannelMerchantSourceEnum; import cn.daxpay.open.platform.core.exception.BizInfoException; diff --git a/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/service/direct/WechatDirectChannelMerchantService.java b/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/service/direct/WechatDirectChannelMerchantService.java index 96009e1d6..d6c3548eb 100644 --- a/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/service/direct/WechatDirectChannelMerchantService.java +++ b/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/service/direct/WechatDirectChannelMerchantService.java @@ -4,8 +4,8 @@ import cn.daxpay.open.channel.wechat.dao.direct.WechatDirectChannelMerchantManag import cn.daxpay.open.channel.wechat.entity.direct.WechatDirectChannelMerchant; import cn.daxpay.open.channel.wechat.param.direct.WechatDirectChannelMerchantCreateParam; import cn.daxpay.open.channel.wechat.result.direct.WechatDirectChannelMerchantResult; -import cn.daxpay.open.payment.channel.dao.mch.ChannelMerchantManager; -import cn.daxpay.open.payment.channel.entity.mch.ChannelMerchant; +import cn.daxpay.open.payment.channel.dao.ChannelMerchantManager; +import cn.daxpay.open.payment.channel.entity.ChannelMerchant; import cn.daxpay.open.platform.core.code.CommonErrorCode; import cn.daxpay.open.platform.core.enums.channel.ChannelMerchantSourceEnum; import cn.daxpay.open.platform.core.exception.BizInfoException; diff --git a/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/service/isv/WechatIsvChannelMerchantService.java b/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/service/isv/WechatIsvChannelMerchantService.java index 9dc947e21..9e01ddf83 100644 --- a/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/service/isv/WechatIsvChannelMerchantService.java +++ b/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/service/isv/WechatIsvChannelMerchantService.java @@ -6,8 +6,8 @@ import cn.daxpay.open.channel.wechat.entity.isv.WechatIsvChannelMerchant; import cn.daxpay.open.channel.wechat.param.isv.WechatIsvAuthAppTypeUpdateParam; import cn.daxpay.open.channel.wechat.param.isv.WechatIsvChannelMerchantCreateParam; import cn.daxpay.open.channel.wechat.result.isv.WechatIsvChannelMerchantResult; -import cn.daxpay.open.payment.channel.dao.mch.ChannelMerchantManager; -import cn.daxpay.open.payment.channel.entity.mch.ChannelMerchant; +import cn.daxpay.open.payment.channel.dao.ChannelMerchantManager; +import cn.daxpay.open.payment.channel.entity.ChannelMerchant; import cn.daxpay.open.platform.core.code.CommonErrorCode; import cn.daxpay.open.platform.core.enums.channel.ChannelMerchantSourceEnum; import cn.daxpay.open.platform.core.exception.BizInfoException; diff --git a/daxpay-channel/daxpay-channel-yeepay/src/main/java/cn/daxpay/open/channel/yeepay/service/direct/YeepayDirectChannelMerchantService.java b/daxpay-channel/daxpay-channel-yeepay/src/main/java/cn/daxpay/open/channel/yeepay/service/direct/YeepayDirectChannelMerchantService.java index f73f0dabb..6ec33ff2c 100644 --- a/daxpay-channel/daxpay-channel-yeepay/src/main/java/cn/daxpay/open/channel/yeepay/service/direct/YeepayDirectChannelMerchantService.java +++ b/daxpay-channel/daxpay-channel-yeepay/src/main/java/cn/daxpay/open/channel/yeepay/service/direct/YeepayDirectChannelMerchantService.java @@ -4,8 +4,8 @@ import cn.daxpay.open.channel.yeepay.code.YeepayCode; import cn.daxpay.open.channel.yeepay.dao.direct.YeepayDirectKeyConfigManager; import cn.daxpay.open.channel.yeepay.entity.direct.YeepayDirectKeyConfig; import cn.daxpay.open.channel.yeepay.param.direct.YeepayDirectChannelMerchantCreateParam; -import cn.daxpay.open.payment.channel.dao.mch.ChannelMerchantManager; -import cn.daxpay.open.payment.channel.entity.mch.ChannelMerchant; +import cn.daxpay.open.payment.channel.dao.ChannelMerchantManager; +import cn.daxpay.open.payment.channel.entity.ChannelMerchant; import cn.daxpay.open.platform.core.enums.channel.ChannelMerchantSourceEnum; import cn.daxpay.open.platform.core.util.ChannelMchNoGenerateUtil; import lombok.RequiredArgsConstructor; diff --git a/daxpay-channel/daxpay-channel-yeepay/src/main/java/cn/daxpay/open/channel/yeepay/service/direct/YeepayDirectConfigAssembler.java b/daxpay-channel/daxpay-channel-yeepay/src/main/java/cn/daxpay/open/channel/yeepay/service/direct/YeepayDirectConfigAssembler.java index 9bba6ff08..28e0bbbee 100644 --- a/daxpay-channel/daxpay-channel-yeepay/src/main/java/cn/daxpay/open/channel/yeepay/service/direct/YeepayDirectConfigAssembler.java +++ b/daxpay-channel/daxpay-channel-yeepay/src/main/java/cn/daxpay/open/channel/yeepay/service/direct/YeepayDirectConfigAssembler.java @@ -2,8 +2,8 @@ package cn.daxpay.open.channel.yeepay.service.direct; import cn.daxpay.open.channel.yeepay.client.credential.YeepaySdkCredential; import cn.daxpay.open.channel.yeepay.entity.direct.YeepayDirectKeyConfig; -import cn.daxpay.open.payment.channel.dao.mch.ChannelMerchantManager; -import cn.daxpay.open.payment.channel.entity.mch.ChannelMerchant; +import cn.daxpay.open.payment.channel.dao.ChannelMerchantManager; +import cn.daxpay.open.payment.channel.entity.ChannelMerchant; import cn.daxpay.open.payment.masterdata.constants.product.dao.PayProductConfigManager; import cn.daxpay.open.payment.masterdata.constants.product.entity.PayProductConfig; import cn.daxpay.open.platform.core.enums.pay.config.PayEnvEnum; diff --git a/daxpay-channel/daxpay-channel-yeepay/src/main/java/cn/daxpay/open/channel/yeepay/service/direct/YeepayDirectKeyConfigService.java b/daxpay-channel/daxpay-channel-yeepay/src/main/java/cn/daxpay/open/channel/yeepay/service/direct/YeepayDirectKeyConfigService.java index 70d4bf704..94015b68a 100644 --- a/daxpay-channel/daxpay-channel-yeepay/src/main/java/cn/daxpay/open/channel/yeepay/service/direct/YeepayDirectKeyConfigService.java +++ b/daxpay-channel/daxpay-channel-yeepay/src/main/java/cn/daxpay/open/channel/yeepay/service/direct/YeepayDirectKeyConfigService.java @@ -4,7 +4,7 @@ import cn.daxpay.open.channel.yeepay.convert.direct.YeepayDirectKeyConfigConvert import cn.daxpay.open.channel.yeepay.dao.direct.YeepayDirectKeyConfigManager; import cn.daxpay.open.channel.yeepay.entity.direct.YeepayDirectKeyConfig; import cn.daxpay.open.channel.yeepay.param.direct.YeepayDirectKeyConfigParam; -import cn.daxpay.open.payment.channel.dao.mch.ChannelMerchantManager; +import cn.daxpay.open.payment.channel.dao.ChannelMerchantManager; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/channel/ChannelMerchantAdminController.java b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/channel/ChannelMerchantAdminController.java index e6c4c24cb..e0776a58f 100644 --- a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/channel/ChannelMerchantAdminController.java +++ b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/channel/ChannelMerchantAdminController.java @@ -7,10 +7,10 @@ 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.channel.param.mch.ChannelMerchantEditParam; -import cn.daxpay.open.payment.channel.param.mch.ChannelMerchantQuery; -import cn.daxpay.open.payment.channel.result.info.ChannelMerchantResult; -import cn.daxpay.open.payment.channel.service.info.ChannelMerchantService; +import cn.daxpay.open.payment.channel.param.ChannelMerchantEditParam; +import cn.daxpay.open.payment.channel.param.ChannelMerchantQuery; +import cn.daxpay.open.payment.channel.result.ChannelMerchantResult; +import cn.daxpay.open.payment.channel.service.ChannelMerchantService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.constraints.NotNull; diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/channel/MerchantChannelMerchantAdminController.java b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/channel/MerchantChannelMerchantAdminController.java index 997378583..49f7aa4b5 100644 --- a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/channel/MerchantChannelMerchantAdminController.java +++ b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/channel/MerchantChannelMerchantAdminController.java @@ -8,10 +8,10 @@ import cn.daxpay.open.platform.core.rest.dto.LabelValue; 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.channel.param.mch.ChannelMerchantEditParam; -import cn.daxpay.open.payment.channel.param.mch.ChannelMerchantQuery; -import cn.daxpay.open.payment.channel.result.info.ChannelMerchantResult; -import cn.daxpay.open.payment.channel.service.info.ChannelMerchantService; +import cn.daxpay.open.payment.channel.param.ChannelMerchantEditParam; +import cn.daxpay.open.payment.channel.param.ChannelMerchantQuery; +import cn.daxpay.open.payment.channel.result.ChannelMerchantResult; +import cn.daxpay.open.payment.channel.service.ChannelMerchantService; import cn.daxpay.open.payment.masterdata.constants.channel.result.PayChannelResult; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/daxpay-payment/daxpay-payment-app-admin/src/main/java/cn/daxpay/open/payment/app/admin/controller/channel/AppAdminChannelMerchantController.java b/daxpay-payment/daxpay-payment-app-admin/src/main/java/cn/daxpay/open/payment/app/admin/controller/channel/AppAdminChannelMerchantController.java index c2ec52648..a572205d2 100644 --- a/daxpay-payment/daxpay-payment-app-admin/src/main/java/cn/daxpay/open/payment/app/admin/controller/channel/AppAdminChannelMerchantController.java +++ b/daxpay-payment/daxpay-payment-app-admin/src/main/java/cn/daxpay/open/payment/app/admin/controller/channel/AppAdminChannelMerchantController.java @@ -1,9 +1,9 @@ package cn.daxpay.open.payment.app.admin.controller.channel; import cn.daxpay.open.payment.app.admin.service.channel.AppAdminChannelMerchantService; -import cn.daxpay.open.payment.channel.param.mch.ChannelMerchantEditParam; -import cn.daxpay.open.payment.channel.param.mch.ChannelMerchantQuery; -import cn.daxpay.open.payment.channel.result.info.ChannelMerchantResult; +import cn.daxpay.open.payment.channel.param.ChannelMerchantEditParam; +import cn.daxpay.open.payment.channel.param.ChannelMerchantQuery; +import cn.daxpay.open.payment.channel.result.ChannelMerchantResult; import cn.daxpay.open.payment.masterdata.constants.channel.result.PayChannelResult; import cn.daxpay.open.platform.core.annotation.PermCode; import cn.daxpay.open.platform.core.code.PermCodes; diff --git a/daxpay-payment/daxpay-payment-app-admin/src/main/java/cn/daxpay/open/payment/app/admin/service/channel/AppAdminChannelMerchantService.java b/daxpay-payment/daxpay-payment-app-admin/src/main/java/cn/daxpay/open/payment/app/admin/service/channel/AppAdminChannelMerchantService.java index 077de4b57..42964365e 100644 --- a/daxpay-payment/daxpay-payment-app-admin/src/main/java/cn/daxpay/open/payment/app/admin/service/channel/AppAdminChannelMerchantService.java +++ b/daxpay-payment/daxpay-payment-app-admin/src/main/java/cn/daxpay/open/payment/app/admin/service/channel/AppAdminChannelMerchantService.java @@ -1,9 +1,9 @@ package cn.daxpay.open.payment.app.admin.service.channel; -import cn.daxpay.open.payment.channel.param.mch.ChannelMerchantEditParam; -import cn.daxpay.open.payment.channel.param.mch.ChannelMerchantQuery; -import cn.daxpay.open.payment.channel.result.info.ChannelMerchantResult; -import cn.daxpay.open.payment.channel.service.info.ChannelMerchantService; +import cn.daxpay.open.payment.channel.param.ChannelMerchantEditParam; +import cn.daxpay.open.payment.channel.param.ChannelMerchantQuery; +import cn.daxpay.open.payment.channel.result.ChannelMerchantResult; +import cn.daxpay.open.payment.channel.service.ChannelMerchantService; import cn.daxpay.open.payment.masterdata.constants.channel.result.PayChannelResult; import cn.daxpay.open.platform.core.rest.dto.LabelValue; import cn.daxpay.open.platform.core.rest.param.PageParam; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/convert/ChannelMerchantConvert.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/convert/ChannelMerchantConvert.java index 495777a4a..0483ba325 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/convert/ChannelMerchantConvert.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/convert/ChannelMerchantConvert.java @@ -1,8 +1,8 @@ package cn.daxpay.open.payment.channel.convert; -import cn.daxpay.open.payment.channel.entity.mch.ChannelMerchant; -import cn.daxpay.open.payment.channel.param.mch.ChannelMerchantGenParam; -import cn.daxpay.open.payment.channel.result.info.ChannelMerchantResult; +import cn.daxpay.open.payment.channel.entity.ChannelMerchant; +import cn.daxpay.open.payment.channel.param.ChannelMerchantGenParam; +import cn.daxpay.open.payment.channel.result.ChannelMerchantResult; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/dao/mch/ChannelMerchantManager.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/dao/ChannelMerchantManager.java similarity index 93% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/dao/mch/ChannelMerchantManager.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/dao/ChannelMerchantManager.java index 27c4c48ff..d161369fe 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/dao/mch/ChannelMerchantManager.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/dao/ChannelMerchantManager.java @@ -1,11 +1,11 @@ -package cn.daxpay.open.payment.channel.dao.mch; +package cn.daxpay.open.payment.channel.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.channel.entity.mch.ChannelMerchant; -import cn.daxpay.open.payment.channel.param.mch.ChannelMerchantQuery; +import cn.daxpay.open.payment.channel.entity.ChannelMerchant; +import cn.daxpay.open.payment.channel.param.ChannelMerchantQuery; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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/channel/dao/mch/ChannelMerchantMapper.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/dao/ChannelMerchantMapper.java similarity index 65% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/dao/mch/ChannelMerchantMapper.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/dao/ChannelMerchantMapper.java index 51c9379ef..b0eaec4b0 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/dao/mch/ChannelMerchantMapper.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/dao/ChannelMerchantMapper.java @@ -1,6 +1,6 @@ -package cn.daxpay.open.payment.channel.dao.mch; +package cn.daxpay.open.payment.channel.dao; -import cn.daxpay.open.payment.channel.entity.mch.ChannelMerchant; +import cn.daxpay.open.payment.channel.entity.ChannelMerchant; 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/channel/entity/mch/ChannelMerchant.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/entity/ChannelMerchant.java similarity index 92% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/entity/mch/ChannelMerchant.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/entity/ChannelMerchant.java index 4a8fe2626..43c7a29db 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/entity/mch/ChannelMerchant.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/entity/ChannelMerchant.java @@ -1,10 +1,10 @@ -package cn.daxpay.open.payment.channel.entity.mch; +package cn.daxpay.open.payment.channel.entity; import cn.daxpay.open.platform.common.mybatisplus.function.ToResult; import cn.daxpay.open.payment.common.entity.MchBaseEntity; import cn.daxpay.open.payment.channel.convert.ChannelMerchantConvert; import cn.daxpay.open.platform.core.enums.channel.ChannelMerchantSourceEnum; -import cn.daxpay.open.payment.channel.result.info.ChannelMerchantResult; +import cn.daxpay.open.payment.channel.result.ChannelMerchantResult; import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/param/mch/ChannelMerchantEditParam.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/param/ChannelMerchantEditParam.java similarity index 92% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/param/mch/ChannelMerchantEditParam.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/param/ChannelMerchantEditParam.java index a4b48c141..c3565b353 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/param/mch/ChannelMerchantEditParam.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/param/ChannelMerchantEditParam.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.channel.param.mch; +package cn.daxpay.open.payment.channel.param; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/param/mch/ChannelMerchantGenParam.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/param/ChannelMerchantGenParam.java similarity index 89% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/param/mch/ChannelMerchantGenParam.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/param/ChannelMerchantGenParam.java index 140ddf29b..f88674505 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/param/mch/ChannelMerchantGenParam.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/param/ChannelMerchantGenParam.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.channel.param.mch; +package cn.daxpay.open.payment.channel.param; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/param/mch/ChannelMerchantQuery.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/param/ChannelMerchantQuery.java similarity index 94% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/param/mch/ChannelMerchantQuery.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/param/ChannelMerchantQuery.java index 7b12b6730..98528f2ad 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/param/mch/ChannelMerchantQuery.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/param/ChannelMerchantQuery.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.channel.param.mch; +package cn.daxpay.open.payment.channel.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/channel/result/info/ChannelMerchantResult.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/result/ChannelMerchantResult.java similarity index 96% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/result/info/ChannelMerchantResult.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/result/ChannelMerchantResult.java index d0d4d6e43..85a7addab 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/result/info/ChannelMerchantResult.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/result/ChannelMerchantResult.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.channel.result.info; +package cn.daxpay.open.payment.channel.result; import cn.daxpay.open.platform.core.enums.channel.ChannelMerchantSourceEnum; import cn.daxpay.open.payment.common.result.MchTradeBaseResult; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/service/info/ChannelMerchantService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/service/ChannelMerchantService.java similarity index 93% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/service/info/ChannelMerchantService.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/service/ChannelMerchantService.java index da4340553..0d6424667 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/service/info/ChannelMerchantService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/service/ChannelMerchantService.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.channel.service.info; +package cn.daxpay.open.payment.channel.service; import cn.daxpay.open.platform.common.mybatisplus.util.MpUtil; import cn.daxpay.open.platform.core.exception.DataNotExistException; @@ -6,11 +6,11 @@ import cn.daxpay.open.platform.core.rest.dto.LabelValue; import cn.daxpay.open.platform.core.rest.param.PageParam; import cn.daxpay.open.platform.core.rest.result.PageResult; import cn.daxpay.open.payment.merchant.service.permission.MerchantPermissionService; -import cn.daxpay.open.payment.channel.dao.mch.ChannelMerchantManager; -import cn.daxpay.open.payment.channel.entity.mch.ChannelMerchant; -import cn.daxpay.open.payment.channel.param.mch.ChannelMerchantEditParam; -import cn.daxpay.open.payment.channel.param.mch.ChannelMerchantQuery; -import cn.daxpay.open.payment.channel.result.info.ChannelMerchantResult; +import cn.daxpay.open.payment.channel.dao.ChannelMerchantManager; +import cn.daxpay.open.payment.channel.entity.ChannelMerchant; +import cn.daxpay.open.payment.channel.param.ChannelMerchantEditParam; +import cn.daxpay.open.payment.channel.param.ChannelMerchantQuery; +import cn.daxpay.open.payment.channel.result.ChannelMerchantResult; import cn.daxpay.open.payment.masterdata.constants.channel.service.PayChannelService; import cn.daxpay.open.payment.masterdata.constants.channel.result.PayChannelResult; import cn.daxpay.open.payment.masterdata.constants.product.dao.PayProductManager; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/assist/ChannelAuthService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/assist/ChannelAuthService.java index 0a33b8072..47c3f21ef 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/assist/ChannelAuthService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/assist/ChannelAuthService.java @@ -1,7 +1,7 @@ package cn.daxpay.open.payment.core.assist; -import cn.daxpay.open.payment.channel.dao.mch.ChannelMerchantManager; -import cn.daxpay.open.payment.channel.entity.mch.ChannelMerchant; +import cn.daxpay.open.payment.channel.dao.ChannelMerchantManager; +import cn.daxpay.open.payment.channel.entity.ChannelMerchant; import cn.daxpay.open.payment.common.service.MerchantContextLoader; import cn.daxpay.open.payment.core.strategy.PaymentStrategyFactory; import cn.daxpay.open.payment.core.strategy.auth.AbsChannelAuthStrategy; 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 d0be0dfd4..891bf8917 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 @@ -1,7 +1,7 @@ package cn.daxpay.open.payment.merchant.service.route.basic; -import cn.daxpay.open.payment.channel.dao.mch.ChannelMerchantManager; -import cn.daxpay.open.payment.channel.entity.mch.ChannelMerchant; +import cn.daxpay.open.payment.channel.dao.ChannelMerchantManager; +import cn.daxpay.open.payment.channel.entity.ChannelMerchant; import cn.daxpay.open.payment.core.strategy.PaymentStrategyFactory; import cn.daxpay.open.payment.merchant.dao.appinfo.MchAppInfoManager; import cn.daxpay.open.payment.merchant.dao.route.basic.PayRouteBasicConfigManager; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/runtime/PayRouteProductResolver.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/runtime/PayRouteProductResolver.java index f47654f35..2c24cddc8 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/runtime/PayRouteProductResolver.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/runtime/PayRouteProductResolver.java @@ -1,7 +1,7 @@ package cn.daxpay.open.payment.merchant.service.route.runtime; -import cn.daxpay.open.payment.channel.dao.mch.ChannelMerchantManager; -import cn.daxpay.open.payment.channel.entity.mch.ChannelMerchant; +import cn.daxpay.open.payment.channel.dao.ChannelMerchantManager; +import cn.daxpay.open.payment.channel.entity.ChannelMerchant; import cn.daxpay.open.platform.core.exception.BizInfoException; import cn.daxpay.open.platform.core.code.CommonErrorCode; import cn.hutool.core.util.StrUtil; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/scene/PayRouteSceneConfigService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/scene/PayRouteSceneConfigService.java index 8bb580ef4..9053d3859 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/scene/PayRouteSceneConfigService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/scene/PayRouteSceneConfigService.java @@ -1,7 +1,7 @@ package cn.daxpay.open.payment.merchant.service.route.scene; -import cn.daxpay.open.payment.channel.dao.mch.ChannelMerchantManager; -import cn.daxpay.open.payment.channel.entity.mch.ChannelMerchant; +import cn.daxpay.open.payment.channel.dao.ChannelMerchantManager; +import cn.daxpay.open.payment.channel.entity.ChannelMerchant; import cn.daxpay.open.payment.merchant.dao.appinfo.MchAppInfoManager; import cn.daxpay.open.payment.merchant.dao.route.scene.PayRouteSceneConfigManager; import cn.daxpay.open.payment.merchant.dao.route.strategy.PayRouteStrategyManager; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/support/PayRouteStrategyCapabilitySupport.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/support/PayRouteStrategyCapabilitySupport.java index d8cb94546..4ffd6e60b 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 @@ -1,7 +1,7 @@ package cn.daxpay.open.payment.merchant.service.route.support; -import cn.daxpay.open.payment.channel.dao.mch.ChannelMerchantManager; -import cn.daxpay.open.payment.channel.entity.mch.ChannelMerchant; +import cn.daxpay.open.payment.channel.dao.ChannelMerchantManager; +import cn.daxpay.open.payment.channel.entity.ChannelMerchant; import cn.daxpay.open.payment.core.strategy.PaymentStrategyFactory; import cn.daxpay.open.payment.merchant.param.route.scene.PayRouteSceneCapabilityBatchItem; import cn.daxpay.open.payment.masterdata.constants.capability.dao.PayCapabilityManager;