Merge branch 'order_received_statistics' into dev

xx-order/xx-order-server/src/main/resources/mapper/BaseOrderMapper.xml

@@ -329,7 +329,7 @@
         select b.*
         from base_order b
         LEFT JOIN order_rent_vehicle_detail r on r.order_id = b.id
-        where b.type = 2 and b.status >= 4
+        where b.type = 1 and (b.status >= 4 or b.status = -1)
         <if test="startTime != null and status == 1">
             and r.start_time between #{startTime} and #{endTime}
         </if>