Merge remote-tracking branch 'origin/master-v2' into master-v2

cloudroam

2024-10-12 021fcaca65cc87874e216630153e17455acaabce

 src/main/resources/mapper/report/OrderReportMapper.xml

@@ -411,6 +411,12 @@
            left join t_supplier_info si on si.id = oi.supplier_id
            left join t_order_item_settlement ois on ois.order_item_id = oi.id
            WHERE oi.deleted = 0
            <if test="dto.startDate != null">
                and o.payment_time &gt; #{dto.startDate}
            </if>
            <if test="dto.endDate != null">
                and o.payment_time &lt;= #{dto.endDate}
            </if>
        )t1
        where 1=1
        <if test="dto.paymentDateStart != null">
@@ -490,7 +496,7 @@
            and o.payment_time &lt;= #{dto.endDate}
        </if>
        <if test="dto.supplierId != null">
            and oi.supplierId = #{dto.supplierId}
            and oi.supplier_id = #{dto.supplierId}
        </if>
        ) t1
        GROUP BY