selectListByVoyageId，selectListByVoyageIdAndRoomId 分房用

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/dal/mysql/order/TradeVisitorMapper.java

@@ -1,8 +1,6 @@
 package com.yc.ship.module.trade.dal.mysql.order;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-
 import com.yc.ship.framework.mybatis.core.mapper.BaseMapperX;
 import com.yc.ship.framework.tenant.core.aop.TenantIgnore;
 import com.yc.ship.module.product.api.dto.OrderRoomUseDTO;
@@ -64,4 +62,7 @@ public interface TradeVisitorMapper extends BaseMapperX<TradeVisitorDO> {
     @Update("UPDATE trade_visitor SET deleted = #{deleted},update_time = now() WHERE order_id = #{orderId}")
     @TenantIgnore
     void updateDeleted(@Param("orderId") Long orderId, @Param("deleted")  int deleted);
+
+
+    List<TradeVisitorDO> selectListByVoyageIdAndRoomId(@Param("voyageId")Long voyageId, @Param("roomId")Long roomId);
 }

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

@@ -180,9 +180,19 @@
     </select>
 
     <select id="selectListByVoyageId" resultType="com.yc.ship.module.trade.dal.dataobject.order.TradeVisitorDO">
+        select tv.*,if(pprmt.total_num &gt;=2 and pprmt.enable_share=0,1,0) as isHaveTogethers,if(pprmt.total_num =1 and pprmt.enable_share=0,1,0) as isAlone
+        from trade_visitor tv
+        join trade_order to1 on tv.order_id=to1.id
+        join trade_order_room_model torm on tv.room_index_id=torm.room_index_id
+        join product_price_room_model_type pprmt on torm.room_model_type_id = pprmt.id
+        where to1.voyage_id=#{voyageId} and to1.order_status=6
+    </select>
+
+    <select id="selectListByVoyageIdAndRoomId"
+            resultType="com.yc.ship.module.trade.dal.dataobject.order.TradeVisitorDO">
         select tv.*
         from trade_visitor tv
-                 join trade_order to1 on tv.order_id=to1.id
-        where to1.voyage_id=#{voyageId}
+                 join trade_order b on tv.order_id=b.id
+        where b.order_status=6 and b.voyage_id=#{voyageId} and if(tv.final_room_id is null,tv.init_room_id,tv.final_room_id)=#{roomId}
     </select>
-</mapper>
+</mapper>