1.修复编译问题

云

2026-07-02 fce7a8df22ab7b5b0be0fb5151c40abbfbab6be8

 yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java

@@ -31,6 +31,11 @@
import cn.iocoder.yudao.module.crm.service.permission.bo.CrmPermissionTransferReqBO;
import cn.iocoder.yudao.module.crm.service.product.CrmProductService;
import cn.iocoder.yudao.module.crm.service.receivable.CrmReceivableService;
import cn.iocoder.yudao.module.erp.api.sale.ErpSaleOrderApi;
import cn.iocoder.yudao.module.erp.api.sale.dto.ErpSaleOrderCreateReqDTO;
import cn.iocoder.yudao.module.erp.api.sale.dto.ErpSaleOrderRespDTO;
import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import com.mzt.logapi.context.LogRecordContext;
import com.mzt.logapi.service.impl.DiffParseFunction;
@@ -46,6 +51,8 @@
import java.time.LocalDateTime;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Set;

import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
@@ -95,6 +102,10 @@
    private AdminUserApi adminUserApi;
    @Resource
    private BpmProcessInstanceApi bpmProcessInstanceApi;
    @Resource
    private ErpSaleOrderApi saleOrderApi;
    @Resource
    private MdmItemApi mdmItemApi;

    @Override
    @Transactional(rollbackFor = Exception.class)
@@ -208,11 +219,19 @@
    }

    private List<CrmContractProductDO> validateContractProducts(List<CrmContractSaveReqVO.Product> list) {
        // 1. 校验产品存在
        productService.validProductList(convertSet(list, CrmContractSaveReqVO.Product::getProductId));
        // 1. 校验物料存在且启用
        Set<Long> itemIds = convertSet(list, CrmContractSaveReqVO.Product::getItemId);
        Map<Long, MdmItemRespDTO> itemMap = mdmItemApi.getItemMap(itemIds);
        // 2. 转化为 CrmContractProductDO 列表
        return convertList(list, o -> BeanUtils.toBean(o, CrmContractProductDO.class,
                item -> item.setTotalPrice(MoneyUtils.priceMultiply(item.getContractPrice(), item.getCount()))));
        return convertList(list, o -> BeanUtils.toBean(o, CrmContractProductDO.class, item -> {
            MdmItemRespDTO mdmItem = itemMap.get(item.getItemId());
            if (mdmItem == null) {
                throw exception(PRODUCT_NOT_EXISTS);
            }
            item.setItemUnitId(mdmItem.getUnitMeasureId());
            item.setItemPrice(mdmItem.getSalesPrice());
            item.setTotalPrice(MoneyUtils.priceMultiply(item.getContractPrice(), item.getCount()));
        }));
    }

    private void calculateTotalPrice(CrmContractDO contract, List<CrmContractProductDO> contractProducts) {
@@ -413,4 +432,66 @@
        return contractMapper.selectListByCustomerIdOwnerUserId(customerId, ownerUserId);
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    @LogRecord(type = CRM_CONTRACT_TYPE, subType = "生成销售订单", bizNo = "{{#id}}",
            success = "合同【{{#contractName}}】生成销售订单【{{#orderNo}}】成功")
    @CrmPermission(bizType = CrmBizTypeEnum.CRM_CONTRACT, bizId = "#id", level = CrmPermissionLevelEnum.WRITE)
    public Long generateSaleOrder(Long id, Long userId) {
        // 1. 校验合同存在且已审批通过
        CrmContractDO contract = validateContractExists(id);
        if (!CrmAuditStatusEnum.APPROVE.getStatus().equals(contract.getAuditStatus())) {
            throw exception(CONTRACT_GENERATE_ORDER_FAIL_NOT_APPROVE);
        }
        // 2. 校验是否已生成销售订单
        ErpSaleOrderRespDTO existOrder = saleOrderApi.getSaleOrderByContractId(id).getCheckedData();
        if (existOrder != null) {
            throw exception(CONTRACT_GENERATE_ORDER_FAIL_EXISTS_ORDER, existOrder.getNo());
        }

        // 3. 获取合同产品列表
        List<CrmContractProductDO> contractProducts = contractProductMapper.selectListByContractId(id);
        if (CollUtil.isEmpty(contractProducts)) {
            throw exception(CONTRACT_GENERATE_ORDER_FAIL_NO_PRODUCT);
        }

        // 4. 构建销售订单创建请求
        ErpSaleOrderCreateReqDTO createReqDTO = new ErpSaleOrderCreateReqDTO();
        createReqDTO.setCustomerId(contract.getCustomerId());
        createReqDTO.setContractId(contract.getId());
        createReqDTO.setContractNo(contract.getNo());
        createReqDTO.setSaleUserId(contract.getOwnerUserId());
        createReqDTO.setOrderTime(LocalDateTime.now().toString());
        createReqDTO.setDiscountPercent(contract.getDiscountPercent());
        createReqDTO.setRemark("由合同【" + contract.getNo() + "】自动生成");

        // 5. 构建订单项
        List<ErpSaleOrderCreateReqDTO.Item> items = contractProducts.stream()
                .map(cp -> {
                    ErpSaleOrderCreateReqDTO.Item item = new ErpSaleOrderCreateReqDTO.Item();
                    item.setProductId(cp.getItemId());
                    item.setProductPrice(cp.getContractPrice());
                    item.setCount(cp.getCount());
                    return item;
                })
                .toList();
        createReqDTO.setItems(items);

        // 6. 创建销售订单
        Long orderId = saleOrderApi.createSaleOrder(createReqDTO).getCheckedData();
        ErpSaleOrderRespDTO order = saleOrderApi.getSaleOrder(orderId).getCheckedData();

        // 7. 更新合同关联订单信息
        contractMapper.updateById(new CrmContractDO()
                .setId(id)
                .setOrderId(orderId)
                .setOrderNo(order.getNo()));

        // 8. 记录操作日志
        LogRecordContext.putVariable("contractName", contract.getName());
        LogRecordContext.putVariable("orderNo", order.getNo());

        return orderId;
    }

}