feat(crm): 增强合同开票与回款功能

云

2026-08-10 9fceeaad9af96bc58ba714560814c6e94f8af406

 yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/quotation/CrmSaleQuotationController.java

@@ -13,7 +13,9 @@
import cn.iocoder.yudao.module.crm.controller.admin.quotation.vo.CrmSaleQuotationSaveReqVO;
import cn.iocoder.yudao.module.crm.dal.dataobject.quotation.CrmSaleQuotationDO;
import cn.iocoder.yudao.module.crm.dal.dataobject.quotation.CrmSaleQuotationProductDO;
import cn.iocoder.yudao.module.crm.dal.dataobject.business.CrmBusinessDO;
import cn.iocoder.yudao.module.crm.dal.dataobject.customer.CrmCustomerDO;
import cn.iocoder.yudao.module.crm.service.business.CrmBusinessService;
import cn.iocoder.yudao.module.crm.service.customer.CrmCustomerService;
import cn.iocoder.yudao.module.crm.service.quotation.CrmSaleQuotationService;
import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
@@ -66,6 +68,8 @@
    private MdmUnitMeasureApi mdmUnitMeasureApi;
    @Resource
    private CrmCustomerService customerService;
    @Resource
    private CrmBusinessService businessService;
    @Resource
    private StorageAttachmentApi storageAttachmentApi;

@@ -178,6 +182,13 @@
                respVO.setCustomerName(customer.getName());
            }
        }
        // 2.1 填充商机名称
        if (saleQuotation.getBusinessId() != null) {
            CrmBusinessDO business = businessService.getBusiness(saleQuotation.getBusinessId());
            if (business != null) {
                respVO.setBusinessName(business.getName());
            }
        }
        // 3. 填充关联信息
        fillSaleQuotationRelatedFields(respVO);
        // 4. 填充附件列表
@@ -204,6 +215,9 @@
        // 1.5 部门信息
        Map<Long, DeptRespDTO> deptMap = deptApi.getDeptMap(
                convertSet(pageResult.getList(), CrmSaleQuotationDO::getOwnerUserId));
        // 1.6 商机信息（过滤 null，businessId 为可选字段）
        Map<Long, CrmBusinessDO> businessMap = businessService.getBusinessMap(
                convertSet(pageResult.getList(), CrmSaleQuotationDO::getBusinessId, vo -> vo.getBusinessId() != null));

        // 2. 开始拼接
        return BeanUtils.toBean(pageResult, CrmSaleQuotationRespVO.class, vo -> {
@@ -213,6 +227,7 @@
            MapUtils.findAndThen(customerMap, vo.getCustomerId(), customer -> vo.setCustomerName(customer.getName()));
            MapUtils.findAndThen(userMap, vo.getOwnerUserId(), user -> vo.setOwnerUserName(user.getNickname()));
            MapUtils.findAndThen(deptMap, vo.getOwnerUserId(), dept -> vo.setOwnerUserDeptName(dept.getName()));
            MapUtils.findAndThen(businessMap, vo.getBusinessId(), business -> vo.setBusinessName(business.getName()));
        });
    }