pay/dax-pay
1
0
Fork 0
mirror of https://gitee.com/dromara/dax-pay synced 2026-08-11 23:25:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(channel): 去掉 ChannelMerchant 冗余子包 mch/info

Browse Source 
将 entity/dao/param 的 mch 与 result/service 的 info 统一拍平到 channel 包下，并同步各通道与管理端的 import。
This commit is contained in:
DaxPay Dev
2026-07-13 15:50:10 +08:00
parent 1247aa1b05
commit 1b9a45003c
39 changed files with 84 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
daxpay-channel/daxpay-channel-adapay/src/main/java/cn/daxpay/open/channel/adapay/service/direct/AdapayDirectChannelMerchantService.java
View File

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

4
daxpay-channel/daxpay-channel-adapay/src/main/java/cn/daxpay/open/channel/adapay/service/direct/AdapayDirectConfigAssembler.java
View File

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

2
daxpay-channel/daxpay-channel-adapay/src/main/java/cn/daxpay/open/channel/adapay/service/direct/AdapayDirectKeyConfigService.java
View File

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

4
daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/service/direct/AlipayDirectChannelMerchantService.java
View File

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

4
daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/service/isv/AlipayIsvChannelMerchantService.java
View File

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

4
daxpay-channel/daxpay-channel-dougong/src/main/java/cn/daxpay/open/channel/dougong/service/isv/DougongIsvChannelMerchantService.java
View File

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

4
daxpay-channel/daxpay-channel-douyin/src/main/java/cn/daxpay/open/channel/douyin/service/direct/DouyinDirectChannelMerchantService.java
View File

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

4
daxpay-channel/daxpay-channel-fuyou/src/main/java/cn/daxpay/open/channel/fuyou/service/isv/FuyouIsvChannelMerchantService.java
View File

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

4
daxpay-channel/daxpay-channel-hkrt/src/main/java/cn/daxpay/open/channel/hkrt/service/isv/HkrtIsvChannelMerchantService.java
View File

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

4
daxpay-channel/daxpay-channel-hmpay/src/main/java/cn/daxpay/open/channel/hmpay/service/isv/HmpayIsvChannelMerchantService.java
View File

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

4
daxpay-channel/daxpay-channel-lakala/src/main/java/cn/daxpay/open/channel/lakala/service/isv/LakalaIsvChannelMerchantService.java
View File

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

4
daxpay-channel/daxpay-channel-leshua/src/main/java/cn/daxpay/open/channel/leshua/service/isv/LeshuaIsvChannelMerchantService.java
View File

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

4
daxpay-channel/daxpay-channel-ums/src/main/java/cn/daxpay/open/channel/ums/service/direct/UmsDirectChannelMerchantService.java
View File

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

4
daxpay-channel/daxpay-channel-ums/src/main/java/cn/daxpay/open/channel/ums/service/direct/UmsDirectConfigAssembler.java
View File

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

2
daxpay-channel/daxpay-channel-ums/src/main/java/cn/daxpay/open/channel/ums/service/direct/UmsDirectKeyConfigService.java
View File

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

4
daxpay-channel/daxpay-channel-vbill/src/main/java/cn/daxpay/open/channel/vbill/service/isv/VbillIsvChannelMerchantService.java
View File

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

4
daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/service/direct/WechatDirectChannelMerchantService.java
View File

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

4
daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/service/isv/WechatIsvChannelMerchantService.java
View File

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

4
daxpay-channel/daxpay-channel-yeepay/src/main/java/cn/daxpay/open/channel/yeepay/service/direct/YeepayDirectChannelMerchantService.java
View File

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

4
daxpay-channel/daxpay-channel-yeepay/src/main/java/cn/daxpay/open/channel/yeepay/service/direct/YeepayDirectConfigAssembler.java
View File

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

2
daxpay-channel/daxpay-channel-yeepay/src/main/java/cn/daxpay/open/channel/yeepay/service/direct/YeepayDirectKeyConfigService.java
View File

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

8
daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/channel/ChannelMerchantAdminController.java
View File

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

8
daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/channel/MerchantChannelMerchantAdminController.java
View File

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

6
daxpay-payment/daxpay-payment-app-admin/src/main/java/cn/daxpay/open/payment/app/admin/controller/channel/AppAdminChannelMerchantController.java
View File

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

8
daxpay-payment/daxpay-payment-app-admin/src/main/java/cn/daxpay/open/payment/app/admin/service/channel/AppAdminChannelMerchantService.java
View File

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

6
daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/convert/ChannelMerchantConvert.java
View File

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

6
daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/dao/mch/ChannelMerchantManager.java → daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/dao/ChannelMerchantManager.java
View File

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

4
daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/dao/mch/ChannelMerchantMapper.java → daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/dao/ChannelMerchantMapper.java
View File

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

4
daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/entity/mch/ChannelMerchant.java → daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/entity/ChannelMerchant.java
View File

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

2
daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/param/mch/ChannelMerchantEditParam.java → daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/param/ChannelMerchantEditParam.java
View File

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

2
daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/param/mch/ChannelMerchantGenParam.java → daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/param/ChannelMerchantGenParam.java
View File

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

2
daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/param/mch/ChannelMerchantQuery.java → daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/param/ChannelMerchantQuery.java
View File

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

2
daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/result/info/ChannelMerchantResult.java → daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/result/ChannelMerchantResult.java
View File

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

12
daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/service/info/ChannelMerchantService.java → daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/service/ChannelMerchantService.java
View File

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

4
daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/assist/ChannelAuthService.java
View File

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

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

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

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

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

4
daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/scene/PayRouteSceneConfigService.java
View File

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

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

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