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

feat: PayProductConfigResult 新增 isv 字段，区分服务商/直连

Browse Source
This commit is contained in:
DaxPay Dev
2026-06-15 14:27:02 +08:00
parent 077c4024df
commit d9cea2e315
2 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/pay/result/masterdata/product/PayProductConfigResult.java
View File

@@ -31,6 +31,10 @@ public class PayProductConfigResult extends BaseResult {
@Schema(description = "生效环境: prod/sandbox")
private String activeEnv;
@Schema(description = "是否已配置参数")
private boolean configured;
/// 是否为服务商模式（true=服务商, false=直连）
private boolean isv;
}

35
daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/pay/service/masterdata/product/PayProductConfigService.java
View File

@@ -2,6 +2,7 @@ package org.dromara.daxpay.payment.pay.service.masterdata.product;
import org.dromara.daxpay.payment.common.util.PaymentStrategyFactory;
import org.dromara.daxpay.payment.pay.dao.product.PayProductConfigManager;
import org.dromara.daxpay.payment.pay.entity.masterdata.product.PayProduct;
import org.dromara.daxpay.payment.pay.entity.masterdata.product.PayProductConfig;
import org.dromara.daxpay.payment.pay.param.masterdata.product.PayProductConfigParam;
import org.dromara.daxpay.payment.pay.result.masterdata.product.PayProductConfigResult;
@@ -16,8 +17,6 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -31,16 +30,17 @@ public class PayProductConfigService {
private final PayProductConfigManager payProductConfigManager;
private final PayProductMasterDataService payProductMasterDataService;
/// 查询全部产品配置列表（卡片页使用）
/// 融合 ProductEnum + pay_product_config 表 + 策略信息
/// 融合 PayProduct + pay_product_config 表 + 策略信息
public List<PayProductConfigResult> listAll() {
Map<String, PayProductConfig> configMap = payProductConfigManager.lambdaQuery().list().stream()
.collect(Collectors.toMap(PayProductConfig::getProduct, c -> c, (a, b) -> a));
return Arrays.stream(ProductEnum.values())
.map(product -> toConfigResult(product, configMap))
.sorted(Comparator.comparing(PayProductConfigResult::getId,
Comparator.nullsLast(Comparator.naturalOrder())))
return payProductMasterDataService.listSortedProducts()
.stream()
.map(payProduct -> toConfigResult(payProduct, configMap))
.toList();
}
@@ -81,20 +81,23 @@ public class PayProductConfigService {
payProductConfigManager.saveOrUpdate(config);
}
/// 枚举 + 库表 + 策略合并为配置结果
private PayProductConfigResult toConfigResult(ProductEnum product, Map<String, PayProductConfig> configMap) {
PayProductConfigResult result = new PayProductConfigResult()
.setProduct(product.getCode())
.setName(I18nUtil.getEnumName(product))
.setChannel(product.getChannel())
.setChannelName(I18nUtil.getEnumName(ChannelEnum.findByCode(product.getChannel())));
/// PayProduct + 库表 + 策略合并为配置结果
private PayProductConfigResult toConfigResult(PayProduct payProduct, Map<String, PayProductConfig> configMap) {
ProductEnum productEnum = ProductEnum.findByCode(payProduct.getCode());
AbsProductStrategy strategy = resolveStrategy(product.getCode());
PayProductConfigResult result = new PayProductConfigResult()
.setProduct(payProduct.getCode())
.setName(productEnum != null ? I18nUtil.getEnumName(productEnum) : payProduct.getCode())
.setChannel(payProduct.getChannel())
.setChannelName(I18nUtil.getEnumName(ChannelEnum.findByCode(payProduct.getChannel())));
AbsProductStrategy strategy = resolveStrategy(payProduct.getCode());
if (strategy != null) {
result.setSandboxSupport(strategy.isSandbox());
result.setIsv(strategy.isIsv());
}
PayProductConfig config = configMap.get(product.getCode());
PayProductConfig config = configMap.get(payProduct.getCode());
if (config != null) {
result.setId(config.getId());
result.setActiveEnv(config.getActiveEnv());