fix: 移植长辉已验证的四类接口 500/体验问题（不含物料颜色字段）

xiaoyi

2026-11-03 481d8165f26fc7e37f0e87f6444ac0340bb563a3

 yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/supplier/SrmSupplierServiceImpl.java

@@ -1,21 +1,40 @@
package cn.iocoder.yudao.module.srm.service.supplier;

import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.exception.ServiceException;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.srm.controller.admin.supplier.vo.SrmSupplierImportExcelVO;
import cn.iocoder.yudao.module.srm.controller.admin.supplier.vo.SrmSupplierImportReqVO;
import cn.iocoder.yudao.module.srm.controller.admin.supplier.vo.SrmSupplierImportRespVO;
import cn.iocoder.yudao.module.srm.controller.admin.supplier.vo.SrmSupplierPageReqVO;
import cn.iocoder.yudao.module.srm.controller.admin.supplier.vo.SrmSupplierSaveReqVO;
import cn.iocoder.yudao.module.srm.dal.dataobject.SrmSupplierDO;
import cn.iocoder.yudao.module.srm.dal.dataobject.*;
import cn.iocoder.yudao.module.srm.dal.mysql.SrmBidAwardMapper;
import cn.iocoder.yudao.module.srm.dal.mysql.SrmBidEvaluationMapper;
import cn.iocoder.yudao.module.srm.dal.mysql.SrmSupplierApplyMapper;
import cn.iocoder.yudao.module.srm.dal.mysql.SrmSupplierCategoryMapper;
import cn.iocoder.yudao.module.srm.dal.mysql.SrmSupplierContactMapper;
import cn.iocoder.yudao.module.srm.dal.mysql.SrmSupplierCertificateMapper;
import cn.iocoder.yudao.module.srm.dal.mysql.SrmSupplierMapper;
import cn.iocoder.yudao.module.srm.dal.mysql.SrmTenderBidMapper;
import cn.iocoder.yudao.module.srm.enums.ErrorCodeConstants;
import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import org.springframework.transaction.annotation.Transactional;

import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;

import cn.hutool.core.collection.CollUtil;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.ArrayList;
import java.util.LinkedHashMap;

@Service
@Validated
@@ -29,6 +48,21 @@

    @Resource
    private SrmSupplierCategoryMapper supplierCategoryMapper;

    @Resource
    private SrmSupplierApplyMapper supplierApplyMapper;

    @Resource
    private SrmSupplierCertificateMapper supplierCertificateMapper;

    @Resource
    private SrmTenderBidMapper tenderBidMapper;

    @Resource
    private SrmBidEvaluationMapper bidEvaluationMapper;

    @Resource
    private SrmBidAwardMapper bidAwardMapper;

    @Override
    public Long createSupplier(SrmSupplierSaveReqVO createReqVO) {
@@ -52,10 +86,13 @@
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void deleteSupplier(Long id) {
        // 校验存在性
        validateSupplierExists(id);
        // 删除关联数据
        // 关联数据存在时，不允许删除
        validateNoReference(id);
        // 可直接清理的关联数据
        supplierContactMapper.deleteBySupplierId(id);
        supplierCategoryMapper.deleteBySupplierId(id);
        // 逻辑删除
@@ -78,8 +115,72 @@
    }

    @Override
    public List<SrmSupplierDO> getSupplierAllList() {
        return supplierMapper.selectList(new LambdaQueryWrapperX<SrmSupplierDO>()
                .orderByAsc(SrmSupplierDO::getId));
    }

    @Override
    public List<SrmSupplierDO> getSupplierList(Collection<Long> ids) {
        if (CollUtil.isEmpty(ids)) {
            return Collections.emptyList();
        }
        return supplierMapper.selectBatchIds(ids);
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public SrmSupplierImportRespVO importSupplierList(List<SrmSupplierImportExcelVO> importSuppliers,
                                                     SrmSupplierImportReqVO importReqVO) {
        // 1. 校验非空
        importSuppliers = CollectionUtils.filterList(importSuppliers,
                item -> StrUtil.isNotBlank(item.getName()));
        if (CollUtil.isEmpty(importSuppliers)) {
            throw ServiceExceptionUtil.exception(ErrorCodeConstants.SUPPLIER_IMPORT_LIST_IS_EMPTY);
        }

        // 2. 逐条处理
        SrmSupplierImportRespVO respVO = SrmSupplierImportRespVO.builder()
                .createSupplierNames(new ArrayList<>())
                .updateSupplierNames(new ArrayList<>())
                .failureSupplierNames(new LinkedHashMap<>())
                .build();
        importSuppliers.forEach(importSupplier -> {
            try {
                // 2.1 校验编码
                if (StrUtil.isBlank(importSupplier.getCode())) {
                    throw ServiceExceptionUtil.exception(ErrorCodeConstants.SUPPLIER_IMPORT_CODE_REQUIRED);
                }
                // 2.2 判断是否存在
                SrmSupplierDO existSupplier = supplierMapper.selectByCode(importSupplier.getCode());
                if (existSupplier == null) {
                    // 2.2.1 新增
                    SrmSupplierDO supplier = BeanUtils.toBean(importSupplier, SrmSupplierDO.class);
                    if (supplier.getStatus() == null) {
                        supplier.setStatus(0);
                    }
                    supplierMapper.insert(supplier);
                    respVO.getCreateSupplierNames().add(importSupplier.getName());
                    return;
                }
                // 2.2.2 已存在，判断是否允许更新
                if (!importReqVO.getUpdateSupport()) {
                    respVO.getFailureSupplierNames().put(importSupplier.getName(),
                            StrUtil.format(ErrorCodeConstants.SUPPLIER_IMPORT_CODE_EXISTS.getMsg(), importSupplier.getCode()));
                    return;
                }
                SrmSupplierDO updateSupplier = BeanUtils.toBean(importSupplier, SrmSupplierDO.class)
                        .setId(existSupplier.getId());
                if (updateSupplier.getStatus() == null) {
                    updateSupplier.setStatus(existSupplier.getStatus());
                }
                supplierMapper.updateById(updateSupplier);
                respVO.getUpdateSupplierNames().add(importSupplier.getName());
            } catch (ServiceException ex) {
                respVO.getFailureSupplierNames().put(importSupplier.getName(), ex.getMessage());
            }
        });
        return respVO;
    }

    // ========== 校验方法 ==========
@@ -97,4 +198,15 @@
        }
    }

    private void validateNoReference(Long id) {
        boolean hasReference = supplierApplyMapper.existsApprovedBySupplierId(id)
                || supplierCertificateMapper.selectCount(SrmSupplierCertificateDO::getSupplierId, id) > 0
                || tenderBidMapper.selectCount(SrmTenderBidDO::getSupplierId, id) > 0
                || bidEvaluationMapper.selectCount(SrmBidEvaluationDO::getSupplierId, id) > 0
                || bidAwardMapper.selectCount(SrmBidAwardDO::getSupplierId, id) > 0;
        if (hasReference) {
            throw ServiceExceptionUtil.exception(ErrorCodeConstants.SUPPLIER_EXISTS_REFERENCE);
        }
    }

}