Merge branch 'master' into master-v2

Cui Zhi Feng

2024-09-08 bc9bd69850c95dacb22c7da4777a1d0470c33722

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

@@ -201,7 +201,7 @@
            </foreach>
        </if>

        ORDER BY q.partner_id, q.warehouse_name, q.warehouse_location_code, q.create_time desc, q.payment_time desc
        ORDER BY q.partner_id DESC, q.warehouse_id, q.warehouse_location_id, q.create_time desc, q.payment_time desc
    </select>

    <select id="getSupplierSaleNum" resultType="com.mzl.flower.dto.response.payment.SupplierNumDTO">
@@ -249,4 +249,11 @@
        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>