Merge remote-tracking branch 'origin/main'

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/dal/mysql/pricearea/PriceAreaMapper.java

@@ -34,6 +34,7 @@ public interface PriceAreaMapper extends BaseMapperX<PriceAreaDO> {
             PriceCountryRespVO priceCountryRespVO = new PriceCountryRespVO();
             priceCountryRespVO.setPrice(priceAreaDO.getPrice());
             priceCountryRespVO.setCountryId(priceAreaDO.getAreaId().intValue());
+            list.add(priceCountryRespVO);
         });
         return list;
     }

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/dal/mysql/voyage/VoyageMapper.java

@@ -11,6 +11,7 @@ import com.yc.ship.module.product.enums.VoyageShelfStatusEnum;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -60,7 +61,7 @@ public interface VoyageMapper extends BaseMapperX<VoyageDO> {
      * @param shipId
      * @param routeId
      */
-    default void deleteByShipIdAndRouteId(LocalDate startDate, LocalDate endDate, Long shipId, Long routeId) {
+    default void deleteByShipIdAndRouteId(LocalDate startDate, LocalDateTime endDate, Long shipId, Long routeId) {
         delete(new LambdaQueryWrapperX<VoyageDO>()
                 .between(VoyageDO::getStartTime, startDate, endDate)
                 .eq(VoyageDO::getShipId, shipId)

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/service/voyage/VoyageServiceImpl.java

@@ -306,11 +306,11 @@ public class VoyageServiceImpl implements VoyageService {
             priceTemplate = priceTemplateService.getPriceTemplate(templateId);
         }
         // 删除该日期内当前游轮当前航线的所有航次
-        voyageMapper.deleteByShipIdAndRouteId(startDate, endDate, shipId, routeId);
+        voyageMapper.deleteByShipIdAndRouteId(startDate, endDate.atTime(23, 59, 59), shipId, routeId);
 
         ShipRespDTO shipRespDTO = shipApi.queryShip(shipId);
         List<VoyageDO> voyageDOList = new ArrayList<>();
-        while (startDate.isBefore(endDate)) {
+        while (startDate.compareTo(endDate) <= 0) {
             VoyageDO voyageDO = new VoyageDO();
             Long id = IdUtil.getSnowflakeNextId();
             voyageDO.setId(id);

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/controller/admin/room/vo/ResourceRoomRespVO.java

@@ -45,4 +45,24 @@ public class ResourceRoomRespVO {
     @DictFormat("common_status") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
     private Integer status;
 
+    /**
+     * 房间介绍
+     */
+    @Schema(description = "房间介绍")
+    private String brief;
+    /**
+     * 房间视频
+     */
+    @Schema(description = "房间视频")
+    private String videoUrl;
+    /**
+     * 房间图片
+     */
+    @Schema(description = "房间图片")
+    private String pciUrl;
+    /**
+     * 备注
+     */
+    @Schema(description = "备注")
+    private String remark;
 }

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/controller/admin/roommodel/vo/ResourceRoomModelRespVO.java

@@ -85,6 +85,27 @@ public class ResourceRoomModelRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
+    /**
+     * 房型介绍
+     */
+    @Schema(description = "房型介绍")
+    private String introduce;
+    /**
+     * 房型图片
+     */
+    @Schema(description = "房型图片")
+    private String picUrl;
+    /**
+     * 房型视频
+     */
+    @Schema(description = "房型视频")
+    private String videoUrl;
+    /**
+     * 备注
+     */
+    @Schema(description = "备注")
+    private String remark;
+
     public void setFloorsNumStr(String floorsNum) {
         String[] split = floorsNum.split(",");
         this.floorsNumStr = Arrays.stream(split).map(element -> element + "F").collect(Collectors.joining( "，"));