Merge remote-tracking branch 'origin/main'

ship-module-trade/ship-module-trade-biz/src/main/resources/mapper/order/TradeOrderMapper.xml

@@ -2200,8 +2200,8 @@
             count( t3.id ) num
         FROM
             trade_order_room_model t1
-                LEFT JOIN resource_room_model t2 ON t1.room_model_id = t2.id
-                LEFT JOIN trade_visitor t3 ON t1.room_index_id = t3.room_index_id
+                LEFT JOIN resource_room_model t2 ON t1.room_model_id = t2.id  and t2.deleted = 0
+                LEFT JOIN trade_visitor t3 ON t1.room_index_id = t3.room_index_id  and t3.deleted = 0
                 LEFT JOIN area t4 ON t3.nationality = t4.id
         WHERE
             t1.order_id = #{orderId}