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

陶杰

2024-09-02 6d943721ed2c41de272450143d6e204e7c4bc446

 src/main/resources/mapper/payment/OrderItemSalesMapper.xml

@@ -77,6 +77,10 @@
        join t_order o on si.order_id = o.id
        left join t_station s on s.id = oi.station_id
        WHERE oi.deleted = 0
        <if test="condition.orderItemId != null and condition.orderItemId != ''">
            AND si.order_item_id = #{condition.orderItemId}
        </if>

        <if test="condition.orderId != null and condition.orderId != ''">
            AND si.order_id = #{condition.orderId}
        </if>
@@ -106,17 +110,17 @@
        </if>

        <if test="condition.orderStartDate != null">
            AND oi.create_time &gt;= #{condition.createStartDate}
            AND oi.create_time &gt;= #{condition.orderStartDate}
        </if>
        <if test="condition.orderEndDate != null">
            AND oi.create_time &lt;= #{condition.createEndDate}
            AND oi.create_time &lt;= #{condition.orderEndDate}
        </if>

        <if test="condition.salesStartDate != null">
            AND si.create_time &gt;= #{condition.createStartDate}
            AND si.create_time &gt;= #{condition.salesStartDate}
        </if>
        <if test="condition.salesEndDate != null">
            AND si.create_time &lt;= #{condition.createEndDate}
            AND si.create_time &lt;= #{condition.salesEndDate}
        </if>

        <if test="condition.status != null and condition.status != ''">