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

refactor: 移除冗余的实体 setId(IdUtil.getSnowflakeNextId()) 手动ID分配

Browse Source
This commit is contained in:
DaxPay Dev
2026-06-14 15:08:17 +08:00
parent dd4aef7d5e
commit 5503874957
3 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
daxpay-channel/daxpay-channel-alipay/src/main/java/org/dromara/daxpay/channel/alipay/service/direct/AlipayDirectChannelMerchantService.java
View File

@@ -40,7 +40,6 @@ public class AlipayDirectChannelMerchantService {
String channelMchNo = String.valueOf(IdUtil.getSnowflakeNextId());
// 写通用通道商户主表
ChannelMerchant channelMerchant = new ChannelMerchant();
channelMerchant.setId(IdUtil.getSnowflakeNextId());
channelMerchant.setMchNo(param.getMchNo());
channelMerchant.setChannelMchNo(channelMchNo);
channelMerchant.setChannelMerchantName(param.getChannelMerchantName());
@@ -50,7 +49,6 @@ public class AlipayDirectChannelMerchantService {
channelMerchantManager.save(channelMerchant);
// 写直连绑定表(alipayUserId 作为业务字段, 不参与关联)
AlipayDirectChannelMerchant entity = new AlipayDirectChannelMerchant();
entity.setId(IdUtil.getSnowflakeNextId());
entity.setMchNo(param.getMchNo());
entity.setChannelMchNo(channelMchNo);
entity.setProduct(param.getProduct());

2
daxpay-channel/daxpay-channel-alipay/src/main/java/org/dromara/daxpay/channel/alipay/service/isv/AlipayIsvChannelMerchantService.java
View File

@@ -46,7 +46,6 @@ public class AlipayIsvChannelMerchantService {
String channelMchNo = "AISV" + IdUtil.getSnowflakeNextId();
// 写通用通道商户主表
ChannelMerchant channelMerchant = new ChannelMerchant();
channelMerchant.setId(IdUtil.getSnowflakeNextId());
channelMerchant.setMchNo(param.getMchNo());
channelMerchant.setChannelMchNo(channelMchNo);
channelMerchant.setChannelMerchantName(param.getChannelMerchantName());
@@ -56,7 +55,6 @@ public class AlipayIsvChannelMerchantService {
channelMerchantManager.save(channelMerchant);
// 写服务商绑定表(含挂靠关系专属字段)
AlipayIsvChannelMerchant entity = new AlipayIsvChannelMerchant();
entity.setId(IdUtil.getSnowflakeNextId());
entity.setMchNo(param.getMchNo());
entity.setChannelMchNo(channelMchNo);
entity.setProduct(param.getProduct());

5
daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/channel/service/apply/OnbMchApplyService.java
View File

@@ -32,7 +32,6 @@ import org.dromara.daxpay.payment.pay.service.masterdata.channel.PayChannelMaste
import org.dromara.daxpay.payment.pay.result.masterdata.channel.PayChannelResult;
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.digest.MD5;
import lombok.RequiredArgsConstructor;
@@ -219,9 +218,7 @@ public class OnbMchApplyService {
var channelMch = new ChannelMerchant();
channelMch.setApplyId(mchApply.getId())
.setSource(ChannelMerchantSourceEnum.APPLY.getCode())
.setMchNo(mchApply.getMchNo())
.setId(IdUtil.getSnowflakeNextId());
.setMchNo(mchApply.getMchNo());
mchApply.setStatus(OnbApplyStatusEnum.GENERATED.getCode());
// 调用策略处理通道商户处理后并保存
var strategy = OnbStrategyFactory.create(mchApply.getChannel(), AbsChannelMerchantStrategy.class);