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

陶杰

2024-09-02 6d943721ed2c41de272450143d6e204e7c4bc446

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

@@ -7,6 +7,10 @@
        where status_backend = 'SEND' and partner_id is not null
    </update>

    <select id="getPartnerOrderReceive" resultType="com.mzl.flower.entity.payment.Order">
        select * from t_order t where status_backend = 'SEND' and partner_id is not null
    </select>

    <select id="getOrderStatusCount" resultType="com.mzl.flower.dto.response.payment.OrderStatusCountDTO">
        SELECT q.status_backend value, count(1) orderCount
        FROM t_order q
@@ -236,4 +240,20 @@
        and o.receive_time &lt; #{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>
</mapper>