From 2c9feb5473acba6b310bee32b9e329a4d342dd37 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Wed, 26 Aug 2026 18:50:02 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=94=AF=E4=BB=98=E5=AE=9D=E5=88=A0?=
=?UTF-8?q?=E9=99=A4=E5=88=86=E8=B4=A6=E5=85=B3=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../service/ThirdMchFzRelationService.java | 3 ++-
.../pay/ThirdMchFzRelationServiceImpl.java | 24 ++-----------------
.../ThirdMchFzRelationServiceImplTest.java | 14 +++++++++++
3 files changed, 18 insertions(+), 23 deletions(-)
diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/service/ThirdMchFzRelationService.java b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/service/ThirdMchFzRelationService.java
index b94029ad1..96e19bcb2 100644
--- a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/service/ThirdMchFzRelationService.java
+++ b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/service/ThirdMchFzRelationService.java
@@ -31,7 +31,8 @@ public interface ThirdMchFzRelationService {
ThirdMchFzRelationVo saveForManage(ThirdMchFzRelationSaveDto dto);
/**
- * 删除关系；已绑定关系只标记为历史关系，默认关系删除前必须自动切换到可用替代关系。
+ * 删除关系；已绑定关系只标记为历史关系，删除默认关系后允许当前支付配置暂时没有默认关系。
+ * 新支付在新的默认关系绑定前会被支付前置校验拒绝，历史订单仍使用原关系快照。
*
* @param ids 关系主键列表
* @return 全部处理成功时返回 true
diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/service/impl/pay/ThirdMchFzRelationServiceImpl.java b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/service/impl/pay/ThirdMchFzRelationServiceImpl.java
index ced357d0a..637de9ff7 100644
--- a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/service/impl/pay/ThirdMchFzRelationServiceImpl.java
+++ b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/service/impl/pay/ThirdMchFzRelationServiceImpl.java
@@ -383,9 +383,8 @@ public class ThirdMchFzRelationServiceImpl implements ThirdMchFzRelationService
/**
* 删除关系；已绑定关系保留为历史事实，只移出默认候选，避免历史订单无法退分账。
*
- * 默认关系删除前必须在同一支付配置下找到另一个已绑定且启用抽佣的关系，
- * 并在当前事务内先切换默认关系，再将旧关系标记为历史。这样管理端可以完整维护关系，
- * 同时不会出现“默认关系已删但新支付没有可用分账关系”的中间状态。
+ * 删除默认关系不再强制寻找替代关系。删除后当前支付配置可以暂时没有默认关系，
+ * 新支付会由支付前置校验拒绝，直到管理端新增并绑定新的默认关系；历史订单仍按原关系快照继续退款和退分账。
*
* @param ids 关系主键
* @return 是否全部处理成功
@@ -409,25 +408,6 @@ public class ThirdMchFzRelationServiceImpl implements ThirdMchFzRelationService
if (relation == null) {
continue;
}
- if (YesNoEnum.YES.getCode().equals(relation.getIsDefault())) {
- ThirdMchFzRelationEntity replacement = relationMapper.selectOne(new LambdaQueryWrapper()
- .eq(ThirdMchFzRelationEntity::getTenantId, tenantId)
- .eq(ThirdMchFzRelationEntity::getMchId, relation.getMchId())
- .eq(ThirdMchFzRelationEntity::getPaySettingId, relation.getPaySettingId())
- .eq(ThirdMchFzRelationEntity::getDelFlag, "0")
- .eq(ThirdMchFzRelationEntity::getStatus, ThirdMchFzRelationStatusEnum.BOUND.getCode())
- .eq(ThirdMchFzRelationEntity::getIsDefault, YesNoEnum.NO.getCode())
- .gt(ThirdMchFzRelationEntity::getFzRatio, 0D)
- .notIn(ThirdMchFzRelationEntity::getId, relationIds)
- .ne(ThirdMchFzRelationEntity::getId, relation.getId())
- .orderByDesc(ThirdMchFzRelationEntity::getCreateTime)
- .last("LIMIT 1"));
- if (replacement == null) {
- throw new IllegalArgumentException("默认分账关系没有可用替代关系，请先新增并绑定一条启用抽佣的关系");
- }
- // setDefault 会在当前事务内清理旧默认标记，再把候选关系设为默认。
- setDefault(replacement);
- }
LambdaUpdateWrapper update = new LambdaUpdateWrapper()
.eq(ThirdMchFzRelationEntity::getId, id)
.eq(ThirdMchFzRelationEntity::getTenantId, tenantId)
diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/test/java/com/bsd/pjcloud/thirdparty/service/impl/pay/ThirdMchFzRelationServiceImplTest.java b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/test/java/com/bsd/pjcloud/thirdparty/service/impl/pay/ThirdMchFzRelationServiceImplTest.java
index 50df7458c..63dbdad9a 100644
--- a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/test/java/com/bsd/pjcloud/thirdparty/service/impl/pay/ThirdMchFzRelationServiceImplTest.java
+++ b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/test/java/com/bsd/pjcloud/thirdparty/service/impl/pay/ThirdMchFzRelationServiceImplTest.java
@@ -338,6 +338,20 @@ class ThirdMchFzRelationServiceImplTest {
() -> Assertions.assertTrue(outRequestNo.matches("[a-z0-9_]+")));
}
+ /**
+ * 删除唯一默认关系时不再强制准备替代关系；已绑定关系转为历史状态，新支付由前置校验阻断。
+ */
+ @Test
+ void removeForManageShouldAllowDeletingDefaultWithoutReplacement() {
+ ThirdMchFzRelationEntity existing = boundWechatRelation(7010L);
+ when(relationMapper.selectOne(any(Wrapper.class))).thenReturn(existing, null);
+ when(relationMapper.update(any(), any())).thenReturn(1);
+
+ Assertions.assertTrue(service.removeForManage(List.of(existing.getId())));
+
+ verify(relationMapper, times(1)).update(any(), any());
+ }
+
/** 构造商户关系同步快照。 */
private MchManageVo merchant(List settings) {
MchManageVo merchant = new MchManageVo();