修改

sen

2026-02-01 93f8c736fd50a80a72d633e888e2d65904bcd7fc

 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;
    }

@@ -193,7 +203,39 @@
            payableFeeManagement.setPayableAmountStr(payableAmountStr);
        }
        
        return payableFeeManagementMapper.updatePayableFeeManagement(payableFeeManagement);
        // 1. 更新主表信息
        int result = payableFeeManagementMapper.updatePayableFeeManagement(payableFeeManagement);
        
        // 2. 获取主表ID
        Integer payableFeeId = payableFeeManagement.getId();
        
        // 3. 删除该应付费用下的所有现有明细
        payableFeeDetailService.deletePayableFeeDetailByPayableFeeId(payableFeeId);
        
        // 4. 批量保存新的明细列表
        if (payableFeeManagement.getPayableFeeDetailList() != null && !payableFeeManagement.getPayableFeeDetailList().isEmpty()) {
            // 设置每个明细的应付费用管理ID
            payableFeeManagement.getPayableFeeDetailList().forEach(detail -> {
                detail.setPayableFeeId(payableFeeId);
                detail.setCreateTime(DateUtils.getNowDate()); // 设置更新时间
            });
            
            // 调用批量插入方法
            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;
    }

    /**
@@ -365,6 +407,7 @@
            bill.setTotalAmount(statisticsVo.getTotalAmountHkd());
            bill.setCnyAmount(statisticsVo.getTotalAmountRmb());
        }
        bill.setPendingAmount(bill.getTotalAmount());
        String noByKey = systemDataNoService.getNoByKey(SystemDataNoEnum.YFZD);
        bill.setSystemNo(noByKey);
        
@@ -391,7 +434,22 @@
        
        return result;
    }
    /**
     * 根据关联账单编号批量更新应付费用管理记录
     * 清除关联账单编号并将状态改为0（待生成账单）
     * 使用场景：当应付账单被删除或作废时，需要将关联的应付费用记录恢复为待生成账单状态
     *
     * @param relatedBillNo 关联账单编号
     * @return 影响的行数
     */
    @Override
    public int updatePayableFeeManagementByRelatedBillNo(String relatedBillNo)
    {
        // 调用Mapper层方法执行批量更新
        int result = payableFeeManagementMapper.updatePayableFeeManagementByRelatedBillNo(relatedBillNo);

        return result;
    }
    /**
     * 作废应付费用管理记录
     *
@@ -449,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);
@@ -466,7 +524,7 @@
            
            // 根据币种显示对应的货币名称
            String currency = entry.getKey();
            if ("CNY".equals(currency)) {
            if ("RMB".equals(currency)) {
                sb.append("人民币");
            } else if ("HKD".equals(currency)) {
                sb.append("港币");
@@ -482,3 +540,4 @@
}