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

gongzuming

2024-09-19 a768dc3daa04d35fedfbe75c0a59b9b2545b85c4

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

@@ -244,4 +244,31 @@
        and o.receive_time < #{endTime}
        and o.bill_id is null
    </select>

    <select id="getUserLastOrder" resultType="com.mzl.flower.entity.payment.Order">
        select o.*
        from t_order o
        where o.receive_time is not null
        AND o.create_by = #{userId}
        order by o.receive_time desc
        limit 1
    </select>

    <select id="getPointGoodsList" resultType="com.mzl.flower.dto.response.payment.OrderPointGoodsListDTO">
        select gr.*
        from t_point_goods_record gr
        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 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
    </select>
</mapper>