wujianwei
2025-12-23 659c0977f53b02a75b032c4d42aeb466614b8ecd
新增日志
2个文件已修改
53 ■■■■■ 已修改文件
service/src/main/java/com/ruoyi/cwgl/service/impl/ReceivableBillManagementServiceImpl.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service/src/main/java/com/ruoyi/cwgl/service/impl/ReceivableBillSettlementDetailServiceImpl.java 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service/src/main/java/com/ruoyi/cwgl/service/impl/ReceivableBillManagementServiceImpl.java
@@ -8,6 +8,7 @@
import com.ruoyi.cwgl.mapper.ReceivableFeeManagementMapper;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -20,10 +21,13 @@
import com.ruoyi.cwgl.mapper.ReceivableBillManagementMapper;
import com.ruoyi.cwgl.domain.ReceivableBillManagement;
import com.ruoyi.cwgl.domain.ReceivableFeeManagement;
import com.ruoyi.cwgl.domain.ReceivableBillManagementLog;
import com.ruoyi.cwgl.service.IReceivableBillManagementLogService;
import com.ruoyi.cwgl.service.IReceivableBillManagementService;
import com.ruoyi.cwgl.service.IReceivableFeeManagementService;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SecurityUtils;
/**
 * 应收账单管理Service业务层处理
@@ -40,6 +44,9 @@
    private ReceivableBillManagementMapper receivableBillManagementMapper;
    @Resource
    private ReceivableFeeManagementMapper receivableFeeManagementMapper;
    @Resource
    private IReceivableBillManagementLogService receivableBillManagementLogService;
    /**
@@ -226,6 +233,14 @@
                // 清除关联账单编号并将状态改为0(待生成账单)
                receivableFeeManagementMapper.updateReceivableFeeManagementByRelatedBillNo(billSystemNo);
            }
            // 记录作废操作日志
            ReceivableBillManagementLog log = new ReceivableBillManagementLog();
            log.setBillId(id);
            log.setCreateBy(SecurityUtils.getUsername());
            log.setCreateTime(DateUtils.getNowDate());
            log.setOperation("作废应收账单,账单编号:" + billManagement.getSystemNo());
            receivableBillManagementLogService.insertReceivableBillManagementLog(log);
        }
        
        return result;
service/src/main/java/com/ruoyi/cwgl/service/impl/ReceivableBillSettlementDetailServiceImpl.java
@@ -19,9 +19,12 @@
import com.ruoyi.cwgl.domain.ReceivableBillSettlementDetail;
import com.ruoyi.cwgl.service.IReceivableBillSettlementDetailService;
import com.ruoyi.cwgl.service.IReceivableBillManagementService;
import com.ruoyi.cwgl.service.IReceivableBillManagementLogService;
import com.ruoyi.cwgl.domain.ReceivableBillManagement;
import com.ruoyi.cwgl.domain.ReceivableBillManagementLog;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SecurityUtils;
import java.math.BigDecimal;
import java.util.Set;
import java.util.Objects;
@@ -44,6 +47,9 @@
    
    @Resource
    private IReceivableBillManagementService receivableBillManagementService;
    @Resource
    private IReceivableBillManagementLogService receivableBillManagementLogService;
    /**
@@ -122,6 +128,17 @@
        // 3. 如果插入成功且billId不为空,则更新主表金额和状态
        if (result > 0 && receivableBillSettlementDetail.getBillId() != null) {
            updateReceivableBillAmountAndStatus(receivableBillSettlementDetail.getBillId());
            // 记录添加结算明细操作日志
            ReceivableBillManagement billManagement = receivableBillManagementService.selectReceivableBillManagementById(receivableBillSettlementDetail.getBillId());
            if (billManagement != null) {
                ReceivableBillManagementLog log = new ReceivableBillManagementLog();
                log.setBillId(receivableBillSettlementDetail.getBillId());
                log.setCreateBy(SecurityUtils.getUsername());
                log.setCreateTime(DateUtils.getNowDate());
                log.setOperation("添加结算明细,账单编号:" + billManagement.getSystemNo());
                receivableBillManagementLogService.insertReceivableBillManagementLog(log);
            }
        }
        
        return result;
@@ -212,6 +229,27 @@
            for (Integer billId : billIds) {
                updateReceivableBillAmountAndStatus(billId);
            }
            // 记录添加结算明细操作日志
            if (!billIds.isEmpty()) {
                for (Integer billId : billIds) {
                    ReceivableBillManagement billManagement = receivableBillManagementService.selectReceivableBillManagementById(billId);
                    if (billManagement != null) {
                        ReceivableBillManagementLog log = new ReceivableBillManagementLog();
                        log.setBillId(billId);
                        log.setCreateBy(SecurityUtils.getUsername());
                        log.setCreateTime(DateUtils.getNowDate());
                        // 计算本次添加的明细数量
                        long detailCount = receivableBillSettlementDetails.stream()
                                .filter(detail -> billId.equals(detail.getBillId()))
                                .count();
                        log.setOperation("添加" + detailCount + "条结算明细,账单编号:" + billManagement.getSystemNo());
                        receivableBillManagementLogService.insertReceivableBillManagementLog(log);
                    }
                }
            }
        }
        
        return rows;