feat(invoiceLedger): 同一销售产品回款两次（一次回款500，一次回款100），客户往来合同金额、应收金额变化了

zss

5 小时以前 a387092945a0fe25ead4809eb1392fcfddfdcf6c

 src/main/resources/mapper/sales/InvoiceLedgerMapper.xml

@@ -111,19 +111,27 @@

    <select id="invoiceLedgerSalesAccount" resultType="com.ruoyi.sales.dto.InvoiceLedgerDto">
        SELECT
            T1.customer_id as id,
            T1.customer_name,
            SUM(contract_amount) AS invoice_total,
            IFNULL( SUM(T2.receipt_payment_amount) , 0 ) AS receipt_payment_amount,
            IFNULL((IFNULL(SUM(contract_amount),0)  - IFNULL(SUM(T2.receipt_payment_amount),0)),0) AS unReceipt_payment_amount
        FROM sales_ledger T1
        LEFT JOIN receipt_payment T2 ON T1.id = T2.sales_ledger_id
        <where>
            <if test="invoiceLedgerDto.searchText != null and invoiceLedgerDto.searchText != '' ">
                T1.customer_name LIKE CONCAT ('%',#{invoiceLedgerDto.searchText},'%')
            </if>
        </where>
        GROUP BY T1.customer_name
    T1.customer_id AS id,
    T1.customer_name,
    SUM(T1.contract_amount) AS invoice_total,
    IFNULL(SUM(T2.receipt_payment_amount), 0) AS receipt_payment_amount,
    IFNULL(SUM(T1.contract_amount) - IFNULL(SUM(T2.receipt_payment_amount), 0), 0) AS unReceipt_payment_amount
FROM (
    SELECT id,customer_id, customer_name, SUM(contract_amount) contract_amount
    FROM sales_ledger
    GROUP BY customer_id, customer_name
) T1
LEFT JOIN (
    SELECT sales_ledger_id, SUM(receipt_payment_amount) receipt_payment_amount
    FROM receipt_payment
    GROUP BY sales_ledger_id
) T2 ON T1.id  = T2.sales_ledger_id
<where>
    <if test="invoiceLedgerDto.searchText != null and invoiceLedgerDto.searchText != '' ">
        T1.customer_name LIKE CONCAT('%',#{invoiceLedgerDto.searchText},'%')
    </if>
</where>
GROUP BY T1.customer_id, T1.customer_name
    </select>

    <select id="invoiceLedgerProductInfo" resultType="com.ruoyi.sales.dto.InvoiceRegistrationProductDto">
@@ -182,4 +190,4 @@
    </select>


</mapper>
</mapper>