|
@@ -6,6 +6,7 @@ import cn.hutool.core.util.ObjectUtil;
|
|
import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
|
|
import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
|
|
import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
|
|
import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
|
|
import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
|
|
import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
|
|
|
|
+import cn.iocoder.yudao.framework.pay.core.client.impl.NonePayClientConfig;
|
|
import cn.iocoder.yudao.framework.pay.core.client.PayClientConfig;
|
|
import cn.iocoder.yudao.framework.pay.core.client.PayClientConfig;
|
|
import cn.iocoder.yudao.framework.pay.core.client.PayClientFactory;
|
|
import cn.iocoder.yudao.framework.pay.core.client.PayClientFactory;
|
|
import cn.iocoder.yudao.framework.pay.core.enums.channel.PayChannelEnum;
|
|
import cn.iocoder.yudao.framework.pay.core.enums.channel.PayChannelEnum;
|
|
@@ -15,6 +16,8 @@ import cn.iocoder.yudao.module.pay.controller.admin.channel.vo.PayChannelUpdateR
|
|
import cn.iocoder.yudao.module.pay.convert.channel.PayChannelConvert;
|
|
import cn.iocoder.yudao.module.pay.convert.channel.PayChannelConvert;
|
|
import cn.iocoder.yudao.module.pay.dal.dataobject.channel.PayChannelDO;
|
|
import cn.iocoder.yudao.module.pay.dal.dataobject.channel.PayChannelDO;
|
|
import cn.iocoder.yudao.module.pay.dal.mysql.channel.PayChannelMapper;
|
|
import cn.iocoder.yudao.module.pay.dal.mysql.channel.PayChannelMapper;
|
|
|
|
+import cn.iocoder.yudao.module.pay.framework.pay.wallet.WalletPayClient;
|
|
|
|
+import cn.iocoder.yudao.module.pay.service.wallet.PayWalletService;
|
|
import lombok.Getter;
|
|
import lombok.Getter;
|
|
import lombok.Setter;
|
|
import lombok.Setter;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
@@ -26,6 +29,7 @@ import javax.annotation.PostConstruct;
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
import javax.validation.Validator;
|
|
import javax.validation.Validator;
|
|
import java.time.LocalDateTime;
|
|
import java.time.LocalDateTime;
|
|
|
|
+import java.util.ArrayList;
|
|
import java.util.Collection;
|
|
import java.util.Collection;
|
|
import java.util.Collections;
|
|
import java.util.Collections;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
@@ -56,6 +60,8 @@ public class PayChannelServiceImpl implements PayChannelService {
|
|
|
|
|
|
@Resource
|
|
@Resource
|
|
private Validator validator;
|
|
private Validator validator;
|
|
|
|
+ @Resource
|
|
|
|
+ private PayWalletService payWalletService;
|
|
|
|
|
|
/**
|
|
/**
|
|
* 初始化 {@link #payClientFactory} 缓存
|
|
* 初始化 {@link #payClientFactory} 缓存
|
|
@@ -75,10 +81,24 @@ public class PayChannelServiceImpl implements PayChannelService {
|
|
log.error("[支付模块 yudao-module-pay - 表结构未导入][参考 https://doc.iocoder.cn/pay/build/ 开启]");
|
|
log.error("[支付模块 yudao-module-pay - 表结构未导入][参考 https://doc.iocoder.cn/pay/build/ 开启]");
|
|
}
|
|
}
|
|
log.info("[initLocalCache][缓存支付渠道,数量为:{}]", channels.size());
|
|
log.info("[initLocalCache][缓存支付渠道,数量为:{}]", channels.size());
|
|
-
|
|
|
|
|
|
+ List<PayChannelDO> walletChannels = new ArrayList<>();
|
|
|
|
+ List<PayChannelDO> otherChannels = new ArrayList<>();
|
|
|
|
+ channels.forEach(t -> {
|
|
|
|
+ if (PayChannelEnum.WALLET.getCode().equals(t.getCode())) {
|
|
|
|
+ walletChannels.add(t);
|
|
|
|
+ } else {
|
|
|
|
+ otherChannels.add(t);
|
|
|
|
+ }
|
|
|
|
+ });
|
|
// 第二步:构建缓存:创建或更新支付 Client
|
|
// 第二步:构建缓存:创建或更新支付 Client
|
|
- channels.forEach(payChannel -> payClientFactory.createOrUpdatePayClient(payChannel.getId(),
|
|
|
|
|
|
+ otherChannels.forEach(payChannel -> payClientFactory.createOrUpdatePayClient(payChannel.getId(),
|
|
payChannel.getCode(), payChannel.getConfig()));
|
|
payChannel.getCode(), payChannel.getConfig()));
|
|
|
|
+
|
|
|
|
+ walletChannels.forEach(payChannel -> {
|
|
|
|
+ WalletPayClient walletPayClient = new WalletPayClient(payChannel.getId(), payChannel.getCode(),
|
|
|
|
+ (NonePayClientConfig) payChannel.getConfig(), payWalletService);
|
|
|
|
+ payClientFactory.createOrUpdateDelegatePayClient(payChannel.getId(), walletPayClient);
|
|
|
|
+ });
|
|
this.channelCache = channels;
|
|
this.channelCache = channels;
|
|
});
|
|
});
|
|
}
|
|
}
|