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

xuxueyang

2024-09-24 272188e47087a8ef92eb0a48b122fa1c73ea94d3

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

@@ -133,6 +133,7 @@
                and (oi.status = 'reduce' or oi.status = 'abnormal')
            )
            and q.transfer_id is null
            and q.status in ('COLLECTION', 'SEND')
        </if>
        <if test="condition.billId != null and condition.billId != ''">
            AND q.bill_id = #{condition.billId}
@@ -143,6 +144,9 @@
                where oi.order_id = q.id
                and oi.flower_name LIKE concat('%', #{condition.flowerName},'%')
            )
        </if>
        <if test="condition.warehouseLocationCode != null and condition.warehouseLocationCode != ''">
            AND q.warehouse_location_code LIKE concat('%', #{condition.warehouseLocationCode},'%')
        </if>

        ORDER BY q.create_time desc, q.payment_time desc
@@ -260,15 +264,15 @@
        join t_order_point_goods opg on opg.goods_record_id = gr.id
        where opg.order_id = #{orderId}
    </select>
    <select id="getFlowerCompleteNumToday" resultType="java.lang.Integer">
    <select id="getFlowerCompleteNumWithinTimeRange" resultType="java.lang.Integer">
        select IFNULL(sum(oi.num),0) as complete_num
        from t_order o
        left join t_order_item oi
        on o.id=oi.order_id
        where o.DELETEd=0 and oi.DELETEd=0
        and o.status_backend not in ('PENDING','CANCEL','REFUND')
        and o.create_by=#{userId}
        AND oi.flower_id=#{flowerId}
        AND o.complete_time BETWEEN  DATE_SUB(CURDATE(), INTERVAL 1 DAY) + INTERVAL 17 HOUR  AND CURDATE() + INTERVAL 17 HOUR
          and o.status_backend not in ('PENDING','CANCEL','REFUND')
          and o.create_by=#{userId}
          AND oi.flower_id=#{flowerId}
          AND o.payment_time BETWEEN  #{startTime}  AND #{endTime}
    </select>
</mapper>