wujianwei
2026-01-15 b991ccbe475c50390eebd4a3253162fc6b4a9b2c
service/src/main/java/com/ruoyi/cwgl/service/impl/PayableFeeManagementServiceImpl.java
@@ -146,7 +146,7 @@
        }
        String noByKey = systemDataNoService.getNoByKey(SystemDataNoEnum.YF);
        payableFeeManagement.setSystemNo(noByKey);
        payableFeeManagement.setCreateBy(SecurityUtils.getUsername());
        // 保存主实体
        int result = payableFeeManagementMapper.insertPayableFeeManagement(payableFeeManagement);
        Integer payableFeeId = payableFeeManagement.getId();
@@ -159,7 +159,17 @@
            });
            payableFeeDetailService.insertPayableFeeDetailBatch(payableFeeManagement.getPayableFeeDetailList());
        }
        if (result > 0) {
            PayableFeeManagementLog log = new PayableFeeManagementLog();
            log.setPayableFeeId(payableFeeId);
            log.setOperator(SecurityUtils.getUsername());
            log.setOperationTime(DateUtils.getNowDate());
            log.setOperationDesc("新增应付费用管理记录,系统编号:" + payableFeeManagement.getSystemNo());
            log.setCreateTime(DateUtils.getNowDate());
            logService.insertPayableFeeManagementLog(log);
        }
        return result;
    }
@@ -207,7 +217,7 @@
            // 设置每个明细的应付费用管理ID
            payableFeeManagement.getPayableFeeDetailList().forEach(detail -> {
                detail.setPayableFeeId(payableFeeId);
                detail.setUpdateTime(DateUtils.getNowDate()); // 设置更新时间
                detail.setCreateTime(DateUtils.getNowDate()); // 设置更新时间
            });
            
            // 调用批量插入方法
@@ -424,7 +434,22 @@
        
        return result;
    }
    /**
     * 根据关联账单编号批量更新应付费用管理记录
     * 清除关联账单编号并将状态改为0(待生成账单)
     * 使用场景:当应付账单被删除或作废时,需要将关联的应付费用记录恢复为待生成账单状态
     *
     * @param relatedBillNo 关联账单编号
     * @return 影响的行数
     */
    @Override
    public int updatePayableFeeManagementByRelatedBillNo(String relatedBillNo)
    {
        // 调用Mapper层方法执行批量更新
        int result = payableFeeManagementMapper.updatePayableFeeManagementByRelatedBillNo(relatedBillNo);
        return result;
    }
    /**
     * 作废应付费用管理记录
     *
@@ -482,7 +507,7 @@
        Map<String, BigDecimal> currencyAmountMap = new HashMap<>();
        for (PayableFeeDetail detail : detailList) {
            String currency = detail.getCurrency();
            BigDecimal billingAmount = detail.getBillingAmount();
            BigDecimal billingAmount = detail.getActualAmount();
            
            if (currency != null && billingAmount != null) {
                currencyAmountMap.merge(currency, billingAmount, BigDecimal::add);
@@ -499,7 +524,7 @@
            
            // 根据币种显示对应的货币名称
            String currency = entry.getKey();
            if ("CNY".equals(currency)) {
            if ("RMB".equals(currency)) {
                sb.append("人民币");
            } else if ("HKD".equals(currency)) {
                sb.append("港币");