fix(settlement): 共用收款主体那格改写「共用收款主体（N 家）」，悬停列出名单

yeg

2 天以前 8dc19f0bd6c4abdc9cec1f9b99b90c33b9da966f

 talent-card-server/src/main/java/com/talentcard/server/service/DependentCardApplyService.java

@@ -1,5 +1,6 @@
package com.talentcard.server.service;

import java.time.LocalDateTime;
import java.util.List;

import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -12,6 +13,7 @@
import com.talentcard.server.mapper.DependentCardApplyStatusLogMapper;
import com.talentcard.server.request.DependentCardApplyRequest;
import com.talentcard.server.request.DependentCardUnbindRequest;
import com.talentcard.server.response.DependentCardApplyDetailResponse;
import com.talentcard.server.response.DependentCardApplyItemResponse;
import com.talentcard.server.response.DependentCardApplyResponse;
import org.springframework.stereotype.Service;
@@ -93,6 +95,7 @@
      return mapper.selectList(
                  Wrappers.<DependentCardApply>lambdaQuery()
                        .eq(DependentCardApply::getTalentCardId, talentCardId)
                        .ne(DependentCardApply::getStatus, DependentCardApply.STATUS_CANCELLED)
                        .orderByDesc(DependentCardApply::getApplyTime)
                        .orderByDesc(DependentCardApply::getId)
            ).stream()
@@ -132,6 +135,63 @@
      return DependentCardApplyItemResponse.from(mapper.selectById(id));
   }


   @Transactional(readOnly = true)
   public DependentCardApplyDetailResponse detail(Long id, Long talentCardId) {
      Long applyId = requirePositive(id, "申请ID不能为空");
      requireTalentCardId(talentCardId);
      DependentCardApply apply = mapper.selectById(applyId);
      if (apply == null || !talentCardId.equals(apply.getTalentCardId())) {
         throw new BusinessException(ErrorCode.NOT_FOUND, "家属附属卡申请不存在");
      }
      return DependentCardApplyDetailResponse.from(apply);
   }

   @Transactional
   public DependentCardApplyItemResponse resubmit(Long id, DependentCardApplyRequest request) {
      Long applyId = requirePositive(id, "申请ID不能为空");
      requireTalentCardId(request.talentCardId());
      DependentCardApply apply = mapper.selectByIdForUpdate(applyId);
      if (apply == null || !request.talentCardId().equals(apply.getTalentCardId())) {
         throw new BusinessException(ErrorCode.NOT_FOUND, "家属附属卡申请不存在");
      }
      if (!Integer.valueOf(DependentCardApply.STATUS_REJECTED).equals(apply.getStatus())) {
         throw new BusinessException(ErrorCode.CONFLICT, "仅已驳回的申请可以修改重新提交");
      }
      LocalDateTime applyTime = LocalDateTime.now();
      int updated = mapper.update(
            null,
            Wrappers.<DependentCardApply>lambdaUpdate()
                  .eq(DependentCardApply::getId, applyId)
                  .eq(DependentCardApply::getTalentCardId, request.talentCardId())
                  .eq(DependentCardApply::getStatus, DependentCardApply.STATUS_REJECTED)
                  .set(DependentCardApply::getDependentName, request.dependentName().trim())
                  .set(DependentCardApply::getDependentMobile, request.dependentMobile().trim())
                  .set(DependentCardApply::getDependentIdCardNo, request.dependentIdCardNo().trim().toUpperCase())
                  .set(DependentCardApply::getRelation, request.relation().trim())
                  .set(DependentCardApply::getApplyTime, applyTime)
                  .set(DependentCardApply::getStatus, DependentCardApply.STATUS_PENDING_REVIEW)
                  .set(DependentCardApply::getAuditBy, (Long) null)
                  .set(DependentCardApply::getAuditTime, (LocalDateTime) null)
                  .set(DependentCardApply::getAuditRemark, (String) null)
      );
      if (updated != 1) {
         throw new BusinessException(ErrorCode.CONFLICT, "申请状态已变化，请刷新后重试");
      }
      recordStatus(
            apply,
            DependentCardApply.STATUS_REJECTED,
            DependentCardApply.STATUS_PENDING_REVIEW,
            "TALENT",
            apply.getTalentId(),
            "小程序修改后重新提交"
      );
      DependentCardApply updatedApply = mapper.selectById(applyId);
      if (updatedApply == null) {
         throw new BusinessException(ErrorCode.INTERNAL_ERROR, "家属附属卡申请重新提交失败");
      }
      return DependentCardApplyItemResponse.from(updatedApply);
   }
   private DependentCardApply ownerCard(Long talentCardId) {
      requireTalentCardId(talentCardId);
      DependentCardApply card = mapper.selectOwnerCard(talentCardId);
@@ -145,14 +205,14 @@
      if (!ELITE_CARD_LEVEL.equals(card.getCardLevel())) {
         throw new BusinessException(ErrorCode.INTERNAL_ERROR, "仅卓越人才卡可申请家属附属卡");
      }
      if (!Integer.valueOf(1).equals(card.getIsFamilyCardEnabled())) {
         throw new BusinessException(ErrorCode.INTERNAL_ERROR, "该主卡未开通家属附属卡申请权限");
      }
      Integer configuredLimit = card.getFamilyCardLimit();
      if (configuredLimit == null || configuredLimit <= 0) {
         throw new BusinessException(ErrorCode.INTERNAL_ERROR, "该主卡未配置家属附属卡名额");
      }
      return Math.min(configuredLimit, MAX_FAMILY_CARD_COUNT);
//      if (!Integer.valueOf(1).equals(card.getIsFamilyCardEnabled())) {
//         throw new BusinessException(ErrorCode.INTERNAL_ERROR, "该主卡未开通家属附属卡申请权限");
//      }
//      Integer configuredLimit = card.getFamilyCardLimit();
//      if (configuredLimit == null || configuredLimit <= 0) {
//         throw new BusinessException(ErrorCode.INTERNAL_ERROR, "该主卡未配置家属附属卡名额");
//      }
      return Math.min(2, MAX_FAMILY_CARD_COUNT);
   }

   private void recordStatus(
@@ -176,6 +236,13 @@
      }
   }

   private Long requirePositive(Long id, String message) {
      if (id == null || id <= 0) {
         throw new BusinessException(ErrorCode.BAD_REQUEST, message);
      }
      return id;
   }

   private void requireTalentCardId(Long talentCardId) {
      if (talentCardId == null || talentCardId <= 0) {
         throw new BusinessException(ErrorCode.INTERNAL_ERROR, "主卡ID不能为空");
@@ -189,4 +256,4 @@
   private String text(Object value) {
      return value == null ? null : String.valueOf(value);
   }
}
}