From 5503874957ec81eb2d86ffcf8d021479da8f2e75 Mon Sep 17 00:00:00 2001
From: DaxPay Dev <dev@daxpay.com>
Date: Sun, 14 Jun 2026 15:08:17 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=A7=BB=E9=99=A4=E5=86=97?=
 =?UTF-8?q?=E4=BD=99=E7=9A=84=E5=AE=9E=E4=BD=93=20setId(IdUtil.getSnowflak?=
 =?UTF-8?q?eNextId())=20=E6=89=8B=E5=8A=A8ID=E5=88=86=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/direct/AlipayDirectChannelMerchantService.java   | 2 --
 .../alipay/service/isv/AlipayIsvChannelMerchantService.java  | 2 --
 .../payment/channel/service/apply/OnbMchApplyService.java    | 5 +----
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/daxpay-channel/daxpay-channel-alipay/src/main/java/org/dromara/daxpay/channel/alipay/service/direct/AlipayDirectChannelMerchantService.java b/daxpay-channel/daxpay-channel-alipay/src/main/java/org/dromara/daxpay/channel/alipay/service/direct/AlipayDirectChannelMerchantService.java
index 06effb4f7..0eb420647 100644
--- a/daxpay-channel/daxpay-channel-alipay/src/main/java/org/dromara/daxpay/channel/alipay/service/direct/AlipayDirectChannelMerchantService.java
+++ b/daxpay-channel/daxpay-channel-alipay/src/main/java/org/dromara/daxpay/channel/alipay/service/direct/AlipayDirectChannelMerchantService.java
@@ -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());
diff --git a/daxpay-channel/daxpay-channel-alipay/src/main/java/org/dromara/daxpay/channel/alipay/service/isv/AlipayIsvChannelMerchantService.java b/daxpay-channel/daxpay-channel-alipay/src/main/java/org/dromara/daxpay/channel/alipay/service/isv/AlipayIsvChannelMerchantService.java
index 41d8196b7..c104495b9 100644
--- a/daxpay-channel/daxpay-channel-alipay/src/main/java/org/dromara/daxpay/channel/alipay/service/isv/AlipayIsvChannelMerchantService.java
+++ b/daxpay-channel/daxpay-channel-alipay/src/main/java/org/dromara/daxpay/channel/alipay/service/isv/AlipayIsvChannelMerchantService.java
@@ -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());
diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/channel/service/apply/OnbMchApplyService.java b/daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/channel/service/apply/OnbMchApplyService.java
index df994a627..93c9efb43 100644
--- a/daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/channel/service/apply/OnbMchApplyService.java
+++ b/daxpay-payment/daxpay-payment-common/src/main/java/org/dromara/daxpay/payment/channel/service/apply/OnbMchApplyService.java
@@ -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);