src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java

@@ -380,13 +380,14 @@
        // 应付总金额金额计算
        BigDecimal amountTotal = BigDecimal.ZERO;
        if(CollectionUtils.isNotEmpty(paymentRecordList)) {
            // 核心分组求和逻辑
            Map<LocalDate, List<PaymentHistoryRecordVo>> dateListMap = paymentRecordList.stream().collect(
                                                                        Collectors.groupingBy(
                                                                                PaymentHistoryRecordVo::getHappenTime,
                                                                                LinkedHashMap::new,
                                                                                Collectors.toList()
                                                                        )
                                                                        );
                    Collectors.groupingBy(
                            PaymentHistoryRecordVo::getHappenTime,
                            LinkedHashMap::new,
                            Collectors.toList()
                    )
            );
            for (LocalDate localDate : dateListMap.keySet()) {
                BigDecimal currentPaymentAmount = BigDecimal.ZERO;
                BigDecimal invoiceAmount = BigDecimal.ZERO;

 src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml

@@ -129,21 +129,23 @@
        SELECT * FROM(
             SELECT
                 T1.issue_date AS happenTime,
                 IFNULL(T1.invoice_amount,0) AS invoiceAmount,
                 sum(IFNULL(T1.invoice_amount,0)) AS invoiceAmount,
                 '1' AS type,
                 0 AS currentPaymentAmount
             FROM
                 ticket_registration T1
                     LEFT JOIN purchase_ledger T2 ON T1.purchase_ledger_id = T2.id
             WHERE T2.supplier_id = #{supplierId}
             GROUP BY T1.issue_date
             UNION
             SELECT
                 payment_date AS happenTime,
                 0 AS invoiceAmount,
                 '0' AS type,
                 current_payment_amount AS currentPaymentAmount
                 sum(ifnull(current_payment_amount,0)) AS currentPaymentAmount
             FROM payment_registration
             WHERE supplier_id = #{supplierId}
             GROUP BY payment_date
        ) T1
        ORDER BY T1.happenTime ASC