游客导出修改

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/report/vo/VisitorSourceDashboardReqVO.java

@@ -20,4 +20,6 @@ public class VisitorSourceDashboardReqVO {
     @Schema(description = "航次ID列表", example = "[1,2,3]")
     private List<Long> voyageIds;
 
+    private List<String> voyageTime;
+
 }

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

@@ -299,9 +299,9 @@
         LEFT JOIN resource_route rr ON pv.route_id = rr.id
         LEFT JOIN ota_distributor od ON tor.source_id = od.id
         LEFT JOIN trade_order_room_model torm ON tv.room_index_id = torm.room_index_id AND torm.deleted = 0
-        left JOIN product_spu ps on ps.id = td.product_id
+        left JOIN product_spu ps on ps.id = td.product_id and ps.deleted = 0
         left join trade_order_pay top ON top.order_id = tor.id and top.deleted = 0 and top.pay_status = 1
-        left Join trade_order_jz tjz on tjz.order_id = tor.id
+        left Join trade_order_jz tjz on tjz.order_id = tor.id and tjz.deleted = 0
         left Join product_price_room_model_type pprmt on torm.room_model_type_id = pprmt.id
 
         WHERE tv.deleted = 0