From 69c96c0579bd31d771b7d87d435e8e38e5af770b Mon Sep 17 00:00:00 2001 From: DaxPay Dev Date: Sun, 28 Jun 2026 19:31:59 +0800 Subject: [PATCH] =?UTF-8?q?style=20=E4=B8=80=E4=BA=9B=E5=B0=8F=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../merchant/dao/appinfo/MchAppInfoManager.java | 11 ----------- .../service/route/facade/PayRouteConfigService.java | 1 + .../service/route/runtime/PayRouteService.java | 3 ++- .../route/support/PayRouteConfigProviders.java | 4 +++- 4 files changed, 6 insertions(+), 13 deletions(-) diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/appinfo/MchAppInfoManager.java b/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/appinfo/MchAppInfoManager.java index ce3dcf47b..83526b743 100644 --- a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/appinfo/MchAppInfoManager.java +++ b/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/appinfo/MchAppInfoManager.java @@ -50,11 +50,6 @@ public class MchAppInfoManager extends BaseManager return requireByAppIdNotTenant(appId).getMchNo(); } - /// 商户是否存在APP - public boolean existByMchNo(String mchNo) { - return existedByField(MchAppInfo::getMchNo, mchNo); - } - /// 分页 public Page page(PageParam pageParam, MchAppInfoQuery query) { Page mpPage = MpUtil.getMpPage(pageParam); @@ -62,12 +57,6 @@ public class MchAppInfoManager extends BaseManager return this.page(mpPage, wrapper); } - /// 根据状态查询所有 - public List findAllByStatus(MchAppStatusEnum status) { - return findAllByField(MchAppInfo::getStatus, status.getCode()); - - } - /// 查询默认应用 public Optional findDefaultByMchNo(String mchNo) { return lambdaQuery() diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/facade/PayRouteConfigService.java b/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/facade/PayRouteConfigService.java index a20d47359..757fed099 100644 --- a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/facade/PayRouteConfigService.java +++ b/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/facade/PayRouteConfigService.java @@ -35,6 +35,7 @@ public class PayRouteConfigService { private final MchAppInfoManager mchAppInfoManager; private final PayRouteSceneConfigService sceneConfigService; private final PayRouteBasicConfigService basicConfigService; + /// 按应用号获取路由策略，不存在则创建默认基础模式策略 @Transactional(rollbackFor = Exception.class) public PayRouteStrategyResult getOrInitByAppId(String appId) { diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/runtime/PayRouteService.java b/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/runtime/PayRouteService.java index 1f01c02b4..1343229f5 100644 --- a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/runtime/PayRouteService.java +++ b/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/runtime/PayRouteService.java @@ -17,6 +17,7 @@ import cn.daxpay.open.payment.unipay.param.trade.pay.PayParam; import cn.daxpay.open.platform.common.i18n.util.I18nUtil; import cn.daxpay.open.platform.core.enums.pay.channel.PayCapabilityEnum; import cn.daxpay.open.platform.core.enums.pay.channel.PayMethodEnum; +import cn.daxpay.open.platform.core.enums.pay.route.PayRouteModeEnum; import cn.daxpay.open.platform.core.code.CommonErrorCode; import cn.daxpay.open.platform.core.exception.BizInfoException; import cn.hutool.core.util.StrUtil; @@ -116,7 +117,7 @@ public class PayRouteService implements PayRouteFacade { /// 按路由模式委托匹配器；未识别模式按场景模式处理 private RouteHit resolveByMode(PayRouteBundle bundle, PayParam payParam, String mode) { - if (Objects.equals(mode, "basic")) { + if (Objects.equals(mode, PayRouteModeEnum.BASIC.getCode())) { return basicMatcher.match(bundle.getBasicConfigs(), payParam); } return PayRouteSceneMatcher.match(bundle.getSceneConfigs(), payParam); diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/support/PayRouteConfigProviders.java b/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/support/PayRouteConfigProviders.java index 67980f553..f372e0ebc 100644 --- a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/support/PayRouteConfigProviders.java +++ b/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/support/PayRouteConfigProviders.java @@ -17,7 +17,9 @@ public class PayRouteConfigProviders { public static final List CODES = List.of( PayProviderEnum.WECHAT.getCode(), PayProviderEnum.ALIPAY.getCode(), - PayProviderEnum.UNION_PAY.getCode()); + PayProviderEnum.UNION_PAY.getCode(), + PayProviderEnum.DOUYIN.getCode() + ); /// 是否属于通道路由配置白名单支付渠道