修改接站信息

ship-module-trade/ship-module-trade-biz/src/main/resources/mapper/orderjzdetail/OrderGiftVisitorMapper.xml

@@ -36,7 +36,7 @@
         INNER JOIN resource_route r ON pv.route_id = r.id
         LEFT JOIN resource_room_model rm ON v.room_model_id = rm.id
         LEFT JOIN trade_order_jz_dispatch dj ON gfv.dispatch_id = dj.id AND dj.source_type = 2
-        WHERE v.deleted = 0 AND o.deleted = 0 AND pv.deleted = 0
+        WHERE v.deleted = 0 AND o.deleted = 0 AND pv.deleted = 0 AND o.order_status IN (15, 14, 13, 10, 12, 9, 8, 7, 6, 5, 4, 3, 1, 0)
         AND o.voyage_id = #{vo.voyageId}
         <if test="vo.idCard != null and vo.idCard != ''">
             AND v.credential_no LIKE CONCAT('%', #{vo.idCard}, '%')
@@ -99,7 +99,7 @@
         INNER JOIN resource_route r ON pv.route_id = r.id
         LEFT JOIN resource_room_model rm ON v.room_model_id = rm.id
         LEFT JOIN trade_order_jz_dispatch dj ON gfv.dispatch_id = dj.id AND dj.source_type = 2
-        WHERE  o.voyage_id = #{vo.voyageId}
+        WHERE  o.voyage_id = #{vo.voyageId} AND o.order_status IN (15, 14, 13, 10, 12, 9, 8, 7, 6, 5, 4, 3, 1, 0)
         <if test="vo.idCard != null and vo.idCard != ''">
             AND v.credential_no LIKE CONCAT('%', #{vo.idCard}, '%')
         </if>

ship-module-trade/ship-module-trade-biz/src/main/resources/mapper/orderjzdetail/OrderJzDetailMapper.xml

@@ -23,7 +23,7 @@
         left join resource_room_model rm on u.room_model_id = rm.id
         left join trade_order_jz_dispatch dj on d.dispatch_id = dj.id
         inner join trade_detail td on td.order_id = o.id and td.product_id != 2034458675435925505
-        where d.deleted = 0 and o.voyage_id = #{vo.voyageId}
+        where d.deleted = 0 and o.voyage_id = #{vo.voyageId} and o.order_status IN (15, 14, 13, 10, 12, 9, 8, 7, 6, 5, 4, 3, 1, 0)
         <if test="vo.idCard != null">
             and d.id_card like concat('%', #{vo.idCard}, '%')
         </if>
@@ -62,7 +62,7 @@
         left join resource_room_model rm on u.room_model_id = rm.id
         left join trade_order_jz_dispatch dj on d.dispatch_id = dj.id
         inner join trade_detail td on td.order_id = o.id and td.product_id != 2034458675435925505
-        where d.deleted = 0 and o.voyage_id = #{vo.voyageId}
+        where d.deleted = 0 and o.voyage_id = #{vo.voyageId} and o.order_status IN (15, 14, 13, 10, 12, 9, 8, 7, 6, 5, 4, 3, 1, 0)
         <if test="vo.idCard != null and vo.idCard != ''">
             and d.id_card like concat('%', #{vo.idCard}, '%')
         </if>