应付接口

wujianwei

2025-12-24 cd19b61393c9676de4e540cd8a7b728dac203646

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

@@ -368,23 +368,52 @@
        SysConfig sysConfig = sysConfigMapper.selectConfig(new SysConfig() {{
            setConfigKey("sys.hk.rmb.rate");
        }});
        // 计算总应收金额
        BigDecimal totalReceivableAmount = receivableFeeList.stream()
                .map(ReceivableFeeManagement::getReceivableAmount)
                .reduce(BigDecimal.ZERO, BigDecimal::add);
        // 计算总应收金额（按币种分别计算）
        BigDecimal totalAmountRmb = BigDecimal.ZERO;
        BigDecimal totalAmountHkd = BigDecimal.ZERO;
        

        // 获取所有应收费用明细，按币种汇总
        if (!receivableFeeList.isEmpty()) {
            // 获取所有应收费用ID
            Integer[] feeIds = receivableFeeList.stream()
                    .map(ReceivableFeeManagement::getId)
                    .toArray(Integer[]::new);
            
            // 查询所有明细记录
            List<ReceivableFeeDetail> allDetails = receivableFeeDetailService.selectReceivableFeeDetailByReceivableFeeIds(feeIds);
            
            // 按币种汇总金额
            for (ReceivableFeeDetail detail : allDetails) {
                if (detail.getBillingAmount() != null && detail.getCurrency() != null) {
                    if ("RMB".equals(detail.getCurrency())) {
                        totalAmountRmb = totalAmountRmb.add(detail.getBillingAmount());
                    } else if ("HKD".equals(detail.getCurrency())) {
                        totalAmountHkd = totalAmountHkd.add(detail.getBillingAmount());
                    }
                }
            }
        }
        
        BigDecimal exchangeRate = new BigDecimal(sysConfig.getConfigValue());
        BigDecimal totalAmountHkd = totalReceivableAmount.divide(exchangeRate, 2, RoundingMode.HALF_UP);
        
        // 计算人民币总金额（人民币金额 + 港币换算成人民币）
        BigDecimal totalAmountRmbWithConversion = totalAmountRmb.add(
                totalAmountHkd.multiply(exchangeRate).setScale(2, RoundingMode.HALF_UP)
        );
        
        // 计算港币总金额（港币金额 + 人民币换算成港币）
        BigDecimal totalAmountHkdWithConversion = totalAmountHkd.add(
                totalAmountRmb.divide(exchangeRate, 2, RoundingMode.HALF_UP)
        );
        

        // 组装返回结果
        ReceivableFeeStatisticsVo result = new ReceivableFeeStatisticsVo();
        result.setDocumentCount(documentCount);
        result.setRate(exchangeRate);
        result.setTotalReceivableAmount(totalReceivableAmount);
        result.setTotalAmountRmb(totalReceivableAmount);
        result.setTotalAmountHkd(totalAmountHkd);
        result.setTotalReceivableAmount(totalAmountRmbWithConversion); // 默认使用人民币总金额
        result.setTotalAmountRmb(totalAmountRmbWithConversion);
        result.setTotalAmountHkd(totalAmountHkdWithConversion);
        result.setIds(ids);
        
        return result;
@@ -422,12 +451,13 @@
        billManagement.setCreateTime(DateUtils.getNowDate());
        billManagement.setBillName(billCreateVo.getBillName());
        billManagement.setCustomerName(billCreateVo.getCustomerName());
        billManagement.setCreateBy(SecurityUtils.getUsername());
        billManagement.setIsInternalSettlement(billCreateVo.getIsInternalSettlement());
        billManagement.setInternalSettlementUnit(billCreateVo.getInternalSettlementUnit());
        // 3. 根据账单类型设置币种和总金额
        if (billType == 0) {
            // 人民币账单
            billManagement.setCurrency("CNY");
            billManagement.setCurrency("RMB");
            billManagement.setTotalAmount(statisticsVo.getTotalAmountRmb());
        } else if (billType == 1) {
            // 港币账单
@@ -436,6 +466,7 @@
        } else {
            throw new IllegalArgumentException("无效的账单类型：" + billType);
        }
        billManagement.setPendingAmount(billManagement.getTotalAmount());
        String noByKey = systemDataNoService.getNoByKey(SystemDataNoEnum.YSZD);
        billManagement.setSystemNo(noByKey);
        // 4. 保存主账单记录
@@ -501,7 +532,7 @@
        Map<String, BigDecimal> currencyAmountMap = new HashMap<>();
        for (ReceivableFeeDetail 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);