flowerbackend-v2
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
cloudroam
2024-12-10 c8ea01fdd9fc8ebf5e1fcbbd56fee7071e4d5809 
 src/main/resources/mapper/payment/OrderMapper.xml


@@ -52,7 +52,7 @@


            AND q.payment_time >= #{condition.createStartDate}


        </if>


        <if test="condition.createEndDate != null">


            AND q.payment_time &lt;= #{condition.createEndDate}


            AND q.payment_time &lt; #{condition.createEndDate}


        </if>


        <if test="condition.partnerId != null">


            AND q.partner_id = #{condition.partnerId}


@@ -94,6 +94,15 @@


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


            AND q.order_no LIKE concat('%', #{condition.orderNo},'%')


        </if>


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


            AND q.customer_province LIKE concat('%', #{condition.province},'%')


        </if>


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


            AND q.customer_city LIKE concat('%', #{condition.city},'%')


        </if>


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


            AND q.customer_region LIKE concat('%', #{condition.region},'%')


        </if>


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


            AND q.customer_address LIKE concat('%', #{condition.customerAddress},'%')


        </if>


@@ -132,7 +141,7 @@


            AND q.payment_time  &gt;= #{condition.createStartDate}


        </if>


        <if test="condition.createEndDate != null">


            AND q.payment_time &lt;= #{condition.createEndDate}


            AND q.payment_time &lt; #{condition.createEndDate}


        </if>


        <if test="condition.partnerId != null">


            AND q.partner_id = #{condition.partnerId}


@@ -161,6 +170,9 @@


        </if>


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


            AND q.warehouse_location_code LIKE concat('%', #{condition.warehouseLocationCode},'%')


        </if>


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


            AND u.nick_name LIKE concat('%', #{condition.createName},'%')


        </if>




        ORDER BY q.create_time desc, q.payment_time desc


@@ -194,7 +206,7 @@


            AND q.payment_time &gt;= #{condition.createStartDate}


        </if>


        <if test="condition.createEndDate != null">


            AND q.payment_time &lt;= #{condition.createEndDate}


            AND q.payment_time &lt; #{condition.createEndDate}


        </if>


<!--        <if test="condition.createStartDate != null">-->


<!--            AND q.create_time &gt;= #{condition.createStartDate}-->


@@ -332,7 +344,7 @@


            AND q.payment_time &gt;= #{condition.startDate}


        </if>


        <if test="condition.endDate != null">


            AND q.payment_time &lt;= #{condition.endDate}


            AND q.payment_time &lt; #{condition.endDate}


        </if>


        <if test="condition.createStartDate != null">


            AND q.create_time &gt;= #{condition.createStartDate}


@@ -374,8 +386,8 @@


    <select id="getOrderSaleAmount" resultType="java.math.BigDecimal">


        SELECT sum(o.payment_amount)


        FROM t_order o


        WHERE o.payment_time is not null


        and o.refund_time is null


        WHERE o.deleted=0


        and o.status_backend not in ('PENDING','CANCEL','REFUND')


        <if test="startTime != null">


            and o.create_time &gt; #{startTime}


        </if>