Cui Zhi Feng
2024-08-26 98153e20935ca47cb0e243410b521756a12a35db
src/main/resources/mapper/payment/OrderItemSalesMapper.xml
@@ -71,7 +71,7 @@
            , oi.flower_level, oi.flower_category, o.customer, o.customer_tel, o.customer_province, o.customer_city
            , o.customer_region, o.customer_address, oi.num flowerNum, oi.supplier_name, oi.price, oi.total
            , o.order_no, si.sales_no, si.title, si.num, si.reason, si.total_fee, si.status, si.create_time
            , si.remarks
            , si.remarks, oi.supplier_price, oi.markup_partner, si.audit_time
        FROM t_order_item_sales si
        join t_order_item oi on oi.id = si.order_item_id
        join t_order o on si.order_id = o.id
@@ -106,17 +106,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 != ''">