fix: 航线添加视频字段，图片改为多图片上传

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/app/voyage/vo/AppCanSelectRoomReqVO.java

@@ -9,4 +9,13 @@ public class AppCanSelectRoomReqVO {
 
     @Schema(description = "航次ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
     private Long voyageId;
+
+    @Schema(description = "房型ID", example = "1024")
+    private Long roomModelId;
+
+    @Schema(description = "分销商ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+    private Long distributeId;
+
+    @Schema(description = "楼层", example = "1024")
+    private Integer floor;
 }

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/controller/admin/route/vo/ResourceRouteRespVO.java

@@ -91,6 +91,9 @@ public class ResourceRouteRespVO {
     @Schema(description = "航线图片")
     private String routeImg;
 
+    @Schema(description = "航线视频")
+    private String routeVideo;
+
     @Schema(description = "航线详情")
     private String routeDetail;
 

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/controller/admin/route/vo/ResourceRouteSaveReqVO.java

@@ -65,6 +65,9 @@ public class ResourceRouteSaveReqVO {
     @Schema(description = "航线图片")
     private String routeImg;
 
+    @Schema(description = "航线视频")
+    private String routeVideo;
+
     @Schema(description = "航线详情")
     private String routeDetail;
 

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/controller/app/route/vo/AppResourceRouteRespVO.java

@@ -16,6 +16,12 @@ public class AppResourceRouteRespVO {
     @Schema(description = "航线名称")
     private String routeName;
 
+    @Schema(description = "航线图片")
+    private String routeImg;
+
+    @Schema(description = "航线视频")
+    private String routeVideo;
+
     @Schema(description = "码头ID")
     private Long dockId;
 

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/dal/dataobject/route/ResourceRouteDO.java

@@ -104,6 +104,11 @@ public class ResourceRouteDO extends BaseDO {
      */
     private String routeImg;
 
+    /**
+     * 航线视频
+     */
+    private String routeVideo;
+
     /**
      * 航线详情
      */

ship-module-resource/ship-module-resource-biz/src/main/resources/mapper/resourceroute/ResourceRouteMapper.xml

@@ -21,7 +21,9 @@
            rr.duration,
            rs.id ship_id,
            rs.NAME ship_name,
+           rr.route_img routeImg,
            rs.img ship_img,
+           rr.route_video routeVideo,
            t2.price
        FROM
            resource_route rr
@@ -29,7 +31,7 @@
                LEFT JOIN resource_port rp on rd.port_id = rp.id
                LEFT JOIN product_voyage pv ON rr.id = pv.route_id
                                                   <if test="reqVo.startDay != null and reqVo.startDay != ''">
-                                                      and pv.start_time BETWEEN BETWEEN CONCAT(#{reqVo.startDay},' 00:00:00') and CONCAT(#{reqVo.startDay},' 23:59:59')
+                                                      and pv.start_time BETWEEN CONCAT(#{reqVo.startDay},' 00:00:00') and CONCAT(#{reqVo.startDay},' 23:59:59')
                                                   </if>
                LEFT JOIN resource_ship rs ON pv.ship_id = rs.id
                LEFT JOIN (