1.售后存在多条情况修复

陶杰

2024-12-06 4e97bf5c84a1aed6c0d9f6df277421f8ba5ed1a9

 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, oi.supplier_price, oi.markup_partner, si.audit_time
            , si.remarks, oi.supplier_price, oi.markup_partner, si.audit_time,si.sales_type, oi.real_price, oi.real_total
        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
@@ -123,8 +123,11 @@
            AND si.create_time <= #{condition.salesEndDate}
        </if>

        <if test="condition.status != null and condition.status != ''">
            AND si.status = #{condition.status}
        <if test="condition.statusList != null and condition.statusList.size > 0">
            AND si.status in
            <foreach collection="condition.statusList" item="item" open="(" separator="," close=")">
                #{item}
            </foreach>
        </if>

        <if test="condition.createBy != null and condition.createBy != ''">
@@ -136,12 +139,18 @@
        <if test="condition.supplierId != null">
            AND oi.supplier_id = #{condition.supplierId}
        </if>
        <if test="condition.supplierId != null">
            AND oi.supplier_id = #{condition.supplierId}
        </if>
        <if test="condition.salesType != null">
            AND si.sales_type = #{condition.salesType}
        </if>

        ORDER BY si.create_time desc
    </select>

    <select id="getSupplierSalesCount" resultType="java.lang.Integer">
        SELECT count(1)
        SELECT count(distinct si.order_id)
        FROM t_order_item_sales si
        join t_order_item oi on oi.id = si.order_item_id
        WHERE oi.deleted = 0
@@ -149,7 +158,7 @@
    </select>

    <select id="getPartnerSalesCount" resultType="java.lang.Integer">
        SELECT count(1)
        SELECT count(distinct si.order_id)
        FROM t_order_item_sales si
        join t_order o on si.order_id = o.id
        WHERE o.deleted = 0