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);