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

refactor: 清理代码中的'开源版'说明注释

Browse Source
This commit is contained in:
DaxPay Dev
2026-06-14 10:55:33 +08:00
parent 591631dac8
commit d7869040fe
10 changed files with 103 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
daxpay-channel/daxpay-channel-alipay/src/main/java/org/dromara/daxpay/channel/alipay/controller/mch/AlipayChannelMerchantController.java
View File

@@ -4,6 +4,7 @@ import org.dromara.daxpay.platform.core.annotation.PermCode;
import org.dromara.daxpay.platform.core.rest.Res;
import org.dromara.daxpay.platform.core.rest.result.Result;
import org.dromara.daxpay.channel.alipay.param.mch.AlipayDirectChannelMerchantCreateParam;
import org.dromara.daxpay.channel.alipay.param.mch.AlipayIsvChannelMerchantCreateParam;
import org.dromara.daxpay.channel.alipay.result.config.AlipayChannelMerchantResult;
import org.dromara.daxpay.channel.alipay.service.mch.AlipayChannelMerchantService;
import io.swagger.v3.oas.annotations.Operation;
@@ -35,6 +36,14 @@ public class AlipayChannelMerchantController {
return Res.ok(alipayChannelMerchantService.findByChannelMchNo(channelMchNo));
}
@PermCode(code = "add", nameCn = "商户通道商户新增", nameEn = "Merchant Channel Merchant Add")
@Operation(summary = "创建支付宝服务商通道商户")
@PostMapping("/create")
public Result<Void> create(@RequestBody @Validated AlipayIsvChannelMerchantCreateParam param) {
alipayChannelMerchantService.create(param);
return Res.ok();
}
@PermCode(code = "add", nameCn = "商户通道商户新增", nameEn = "Merchant Channel Merchant Add")
@Operation(summary = "创建支付宝直连通道商户")
@PostMapping("/create-direct")

8
daxpay-channel/daxpay-channel-alipay/src/main/java/org/dromara/daxpay/channel/alipay/dao/config/AlipayChannelMerchantManager.java
View File

@@ -6,4 +6,12 @@ import org.springframework.stereotype.Repository;
@Repository
public class AlipayChannelMerchantManager extends BaseManager<AlipayChannelMerchantMapper, AlipayChannelMerchant> {
/// 校验同一支付宝服务商应用下是否已绑定该子商户号
public boolean existsByIsvAppIdAndAlipayUserId(String isvAppId, String alipayUserId) {
return lambdaQuery()
.eq(AlipayChannelMerchant::getIsvAppId, isvAppId)
.eq(AlipayChannelMerchant::getAlipayUserId, alipayUserId)
.exists();
}
}

38
daxpay-channel/daxpay-channel-alipay/src/main/java/org/dromara/daxpay/channel/alipay/param/mch/AlipayIsvChannelMerchantCreateParam.java Normal file
View File

@@ -0,0 +1,38 @@
package org.dromara.daxpay.channel.alipay.param.mch;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
import lombok.experimental.Accessors;
@Data
@Accessors(chain = true)
@Schema(title = "支付宝服务商通道商户创建参数")
public class AlipayIsvChannelMerchantCreateParam {
@Schema(description = "商户号")
@NotBlank(message = "{validation.field.mchNo.notBlank}")
private String mchNo;
@Schema(description = "通道商户名称")
@NotBlank(message = "{validation.field.channelMerchantName.notBlank}")
private String channelMerchantName;
@Schema(description = "所属支付产品")
@NotBlank(message = "{validation.field.product.notBlank}")
private String product;
/// 支付宝服务商应用ID
@Schema(description = "支付宝服务商应用ID")
@NotBlank(message = "{validation.field.isvAppId.notBlank}")
private String isvAppId;
@Schema(description = "支付宝商家用户ID(2088开头)")
@NotBlank(message = "{validation.field.alipayUserId.notBlank}")
private String alipayUserId;
/// 应用授权令牌，服务商代商户调用接口的凭据
@Schema(description = "应用授权令牌")
@NotBlank(message = "{validation.field.appAuthToken.notBlank}")
private String appAuthToken;
}

41
daxpay-channel/daxpay-channel-alipay/src/main/java/org/dromara/daxpay/channel/alipay/service/mch/AlipayChannelMerchantService.java
View File

@@ -1,12 +1,16 @@
package org.dromara.daxpay.channel.alipay.service.mch;
import org.dromara.daxpay.channel.alipay.dao.app.AlipayIsvAppManager;
import org.dromara.daxpay.channel.alipay.dao.config.AlipayChannelMerchantManager;
import org.dromara.daxpay.channel.alipay.entity.config.AlipayChannelMerchant;
import org.dromara.daxpay.channel.alipay.param.mch.AlipayDirectChannelMerchantCreateParam;
import org.dromara.daxpay.channel.alipay.param.mch.AlipayIsvChannelMerchantCreateParam;
import org.dromara.daxpay.channel.alipay.result.config.AlipayChannelMerchantResult;
import org.dromara.daxpay.payment.channel.dao.mch.ChannelMerchantManager;
import org.dromara.daxpay.payment.channel.entity.mch.ChannelMerchant;
import org.dromara.daxpay.platform.core.code.CommonErrorCode;
import org.dromara.daxpay.platform.core.enums.channel.ChannelMerchantSourceEnum;
import org.dromara.daxpay.platform.core.exception.BizInfoException;
import org.dromara.daxpay.platform.core.exception.DataNotExistException;
import cn.hutool.core.util.IdUtil;
import lombok.RequiredArgsConstructor;
@@ -21,7 +25,43 @@ public class AlipayChannelMerchantService {
private final ChannelMerchantManager channelMerchantManager;
private final AlipayChannelMerchantManager alipayChannelMerchantManager;
private final AlipayIsvAppManager alipayIsvAppManager;
/// 创建支付宝服务商通道商户
@Transactional(rollbackFor = Exception.class)
public void create(AlipayIsvChannelMerchantCreateParam param) {
var isvApp = alipayIsvAppManager.findByAliAppId(param.getIsvAppId())
.orElseThrow(() -> new DataNotExistException("error.channel.alipay.appNotFound"));
// 校验同一应用下子商户号不重复
if (alipayChannelMerchantManager.existsByIsvAppIdAndAlipayUserId(
isvApp.getAliAppId(), param.getAlipayUserId())) {
throw new BizInfoException(CommonErrorCode.VALIDATE_PARAMETERS_ERROR, "error.channel.alipay.subMerchantDuplicate");
}
// 生成通道商户号：前缀 AISV + 雪花ID（无分隔符，符合 TradeNoGenerateUtil 约定）
String channelMchNo = "AISV" + IdUtil.getSnowflakeNextId();
// 写通用通道商户主表
ChannelMerchant channelMerchant = new ChannelMerchant();
channelMerchant.setId(IdUtil.getSnowflakeNextId());
channelMerchant.setMchNo(param.getMchNo());
channelMerchant.setChannelMchNo(channelMchNo);
channelMerchant.setChannelMerchantName(param.getChannelMerchantName());
channelMerchant.setProduct(param.getProduct());
channelMerchant.setSource(ChannelMerchantSourceEnum.MANUAL.getCode());
channelMerchant.setEnable(true);
channelMerchantManager.save(channelMerchant);
// 写支付宝扩展表（含服务商专属字段）
AlipayChannelMerchant alipayChannelMerchant = new AlipayChannelMerchant();
alipayChannelMerchant.setId(IdUtil.getSnowflakeNextId());
alipayChannelMerchant.setMchNo(param.getMchNo());
alipayChannelMerchant.setChannelMchNo(channelMchNo);
alipayChannelMerchant.setProduct(param.getProduct());
alipayChannelMerchant.setIsvAppId(isvApp.getAliAppId());
alipayChannelMerchant.setAlipayUserId(param.getAlipayUserId());
alipayChannelMerchant.setAppAuthToken(param.getAppAuthToken());
alipayChannelMerchantManager.save(alipayChannelMerchant);
}
/// 创建支付宝直连通道商户
@Transactional(rollbackFor = Exception.class)
public Long createDirect(AlipayDirectChannelMerchantCreateParam param) {
String channelMchNo = param.getAlipayUserId();
@@ -55,3 +95,4 @@ public class AlipayChannelMerchantService {
.orElseThrow(() -> new DataNotExistException("error.payment.channel.channelMerchantNotExist"));
}
}

5
daxpay-payment/daxpay-payment-merchant/src/main/java/org/dromara/daxpay/payment/merchant/service/route/basic/PayRouteBasicConfigService.java
View File

@@ -29,7 +29,6 @@ import java.util.stream.Collectors;
/// # 通道路由基础模式配置
///
/// 按支付渠道配置默认支付产品，保存前校验产品策略能力。
/// 开源版：所有产品默认可用，不再检查商户启用状态。
@Service
@RequiredArgsConstructor
public class PayRouteBasicConfigService {
@@ -68,7 +67,7 @@ public class PayRouteBasicConfigService {
}
}
/// 校验产品存在且支持指定支付渠道（开源版：不再检查商户启用状态）
/// 校验产品存在且支持指定支付渠道
public void validateBasicProduct(String product, PayProviderEnum provider) {
ProductEnum productEnum = ProductEnum.findByCode(product);
if (productEnum == null) {
@@ -103,7 +102,7 @@ public class PayRouteBasicConfigService {
.setProducts(products);
}
/// 从产品枚举中筛出支持指定支付渠道的产品编码（开源版：所有产品默认可用）
/// 从产品枚举中筛出支持指定支付渠道的产品编码
private List<String> productsForProvider(PayProviderEnum provider) {
return Arrays.stream(ProductEnum.values())
.map(ProductEnum::getCode)

3
daxpay-payment/daxpay-payment-merchant/src/main/java/org/dromara/daxpay/payment/merchant/service/route/basic/PayRouteBasicMatcher.java
View File

@@ -21,7 +21,6 @@ import java.util.Objects;
/// # 基础模式通道路由匹配器
///
/// 按已配置的支付渠道与支付产品，结合产品策略解析通道与支付方式。
/// 开源版：所有产品默认可用，不再检查商户启用状态。
@Component
@RequiredArgsConstructor
public class PayRouteBasicMatcher {
@@ -73,7 +72,7 @@ public class PayRouteBasicMatcher {
.orElse(null);
}
/// 校验产品策略支持该支付渠道（开源版：不再检查商户启用状态）
/// 校验产品策略支持该支付渠道
private void assertProductConfigured(String product, PayProviderEnum provider) {
if (!PaymentStrategyFactory.productSupportsProvider(product, provider)) {
throw new BizInfoException(CommonErrorCode.VALIDATE_PARAMETERS_ERROR,

3
daxpay-payment/daxpay-payment-merchant/src/main/java/org/dromara/daxpay/payment/merchant/service/route/runtime/PayRouteProductResolver.java
View File

@@ -14,14 +14,13 @@ import java.util.Objects;
/// # 通道路由产品解析器
///
/// 开源版：所有产品默认可用，直接从产品枚举中按通道+支付方式解析产品编码。
@Service
@RequiredArgsConstructor
public class PayRouteProductResolver {
private final PayRouteStrategyCapabilitySupport payRouteStrategyCapabilitySupport;
/// 根据通道及支付方式解析产品编码（开源版：所有产品默认可用）
/// 根据通道及支付方式解析产品编码
public String resolve(String mchNo, String channel, String method) {
return Arrays.stream(ProductEnum.values())
.filter(pe -> Objects.equals(pe.getChannel(), channel))

4
daxpay-payment/daxpay-payment-merchant/src/main/java/org/dromara/daxpay/payment/merchant/service/route/support/PayRouteStrategyCapabilitySupport.java
View File

@@ -33,7 +33,6 @@ import java.util.Objects;
/// # 通道路由：策略方式→能力与 DB 求交
///
/// 统一场景模式产品/能力候选及保存校验，数据源为 {@link AbsProductStrategy#methodCapabilityMapping()}。
/// 开源版：所有产品默认可用，不再检查商户启用状态。
@Service
@RequiredArgsConstructor
public class PayRouteStrategyCapabilitySupport {
@@ -81,7 +80,7 @@ public class PayRouteStrategyCapabilitySupport {
return provider + "|" + method + "|" + product;
}
/// 目录项下可用支付产品候选（开源版：所有产品默认可用）
/// 目录项下可用支付产品候选
public List<LabelValue> listSceneProductCandidates(String provider, String method) {
if (!payProviderMethodService.contains(provider, method)) {
return List.of();
@@ -102,7 +101,6 @@ public class PayRouteStrategyCapabilitySupport {
}
/// 指定产品+目录项下支付能力候选（策略 Map ∩ DB ∩ 能力主数据启用）
/// 开源版：不再检查商户产品启用状态
public List<LabelValue> listSceneCapabilityCandidates(String provider, String method, String product) {
if (!payProviderMethodService.contains(provider, method)) {
return List.of();

1
daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/en-US/error/channel/alipay.json
View File

@@ -36,5 +36,6 @@
"mchProductConfigNotExist": "Alipay merchant product payment configuration not found",
"appIdDuplicate": "Application ID already exists under the same service provider",
"appNotFound": "Alipay ISV application not found",
"subMerchantDuplicate": "This sub-merchant already exists under the Alipay application",
"userIdTypeInvalid": "Invalid user ID type"
}

1
daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/zh-CN/error/channel/alipay.json
View File

@@ -36,5 +36,6 @@
"mchProductConfigNotExist": "支付宝产品支付配置不存在",
"appIdDuplicate": "同一服务商下应用ID已存在",
"appNotFound": "支付宝服务商应用不存在",
"subMerchantDuplicate": "该支付宝应用下已存在此子商户号",
"userIdTypeInvalid": "用户标识类型不合法"
}