新增客户判断

wujianwei

2025-12-22 3692b7efce1d71faf372785b687e7357b6d39209

 service/src/main/java/com/ruoyi/cwgl/service/impl/ReceivableFeeManagementServiceImpl.java

@@ -2,8 +2,11 @@

import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;

import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DateUtils;
import javax.annotation.Resource;

@@ -238,6 +241,17 @@
        // 查询应收费用主表记录
        List<ReceivableFeeManagement> receivableFeeList = receivableFeeManagementMapper.selectReceivableFeeManagementByIds(ids);
        
        // 检查所有记录是否属于同一个客户
        if (!receivableFeeList.isEmpty()) {
            Integer firstCustomerId = receivableFeeList.get(0).getCustomerId();
            boolean allSameCustomer = receivableFeeList.stream()
                    .allMatch(item -> Objects.equals(item.getCustomerId(), firstCustomerId));
            
            if (!allSameCustomer) {
                throw new ServiceException("所选记录包含不同客户的数据，无法进行统计");
            }
        }
        
        // 计算单据数量
        int documentCount = receivableFeeList.size();
        SysConfig sysConfig = sysConfigMapper.selectConfig(new SysConfig() {{
@@ -263,6 +277,7 @@
        result.setTotalAmountRmb(totalReceivableAmount);
        result.setTotalAmountHkd(totalAmountHkd);
        result.setDetailList(detailList);
        result.setIds(ids);
        
        return result;
    }
@@ -300,36 +315,26 @@
        }

        // 4. 保存主账单记录
        receivableBillManagementService.insertReceivableBillManagement(billManagement);
        Integer billId = billManagement.getId();
        int i = receivableBillManagementService.insertReceivableBillManagement(billManagement);

        // 5. 创建应收账单结算明细
        List<ReceivableBillSettlementDetail> detailList = new java.util.ArrayList<>();
        for (ReceivableFeeDetail feeDetail : statisticsVo.getDetailList()) {
            ReceivableBillSettlementDetail settlementDetail = new ReceivableBillSettlementDetail();
            settlementDetail.setBillId(billId);
        // 5. 更新应收费用主表的关联账单编号
        if (statisticsVo.getIds() != null && statisticsVo.getIds().length > 0) {
            // 获取生成的账单系统编号
            String billSystemNo = billManagement.getSystemNo();
            
            // 根据账单类型设置明细金额
            if (billType == 0) {
                // 人民币账单使用原金额
                settlementDetail.setReceiptAmount(feeDetail.getBillingAmount());
            } else {
                // 港币账单转换金额
                settlementDetail.setReceiptAmount(feeDetail.getBillingAmount().divide(statisticsVo.getRate(), 2, RoundingMode.HALF_UP));
            // 批量更新应收费用主表的关联账单编号
            List<ReceivableFeeManagement> feeManagements = new ArrayList<>();
            for (Integer feeId : statisticsVo.getIds()) {
                ReceivableFeeManagement feeManagement = new ReceivableFeeManagement();
                feeManagement.setId(feeId);
                feeManagement.setRelatedBillNo(billSystemNo);
                feeManagements.add(feeManagement);
            }
            
            // 设置其他明细信息
            settlementDetail.setSettlementMethod("0"); // 默认为空，后续可以更新
            settlementDetail.setCreateTime(DateUtils.getNowDate());
            
            detailList.add(settlementDetail);
            // 调用批量更新方法
            updateReceivableFeeManagementBatch(feeManagements);
        }

        // 6. 批量保存明细记录
        if (!detailList.isEmpty()) {
            receivableBillSettlementDetailService.insertReceivableBillSettlementDetailBatch(detailList);
        }

        return billId;
        return i;
    }
}
}