fix: 房型添加最大可入住人数，最大可入住成人数，最大可入住儿童数字段

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/pricetemplate/vo/PriceRoomModelRespVO.java

@@ -2,6 +2,7 @@ package com.yc.ship.module.product.controller.admin.pricetemplate.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.yc.ship.module.resource.controller.admin.roommodel.vo.ResourceRoomModelRespVO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -48,4 +49,7 @@ public class PriceRoomModelRespVO {
     @Schema(description = "价格单人票设置")
     private PriceSingleSettingRespVO singleSetting;
 
+    @Schema(description = "房型信息")
+    private ResourceRoomModelRespVO roomModel;
+
 }

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/pricevoyage/PriceVoyageController.java

@@ -30,6 +30,9 @@ import com.yc.ship.module.resource.api.route.RouteApi;
 import com.yc.ship.module.resource.api.route.dto.RouteRespDTO;
 import com.yc.ship.module.resource.api.ship.ShipApi;
 import com.yc.ship.module.resource.api.ship.dto.ShipRespDTO;
+import com.yc.ship.module.resource.controller.admin.roommodel.vo.ResourceRoomModelRespVO;
+import com.yc.ship.module.resource.dal.dataobject.roommodel.ResourceRoomModelDO;
+import com.yc.ship.module.resource.service.roommodel.ResourceRoomModelService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -81,6 +84,9 @@ public class PriceVoyageController {
     @Resource
     private RouteApi routeApi;
 
+    @Resource
+    private ResourceRoomModelService roomModelService;
+
 
     @PostMapping("/create")
     @Operation(summary = "创建航次价格")
@@ -146,8 +152,15 @@ public class PriceVoyageController {
         List<PriceSingleSettingDO> singleSettingDO = priceSingleSettingService.getByObjectId(id);
         List<PriceSingleSettingRespVO> priceSingleSettingRespVOS = BeanUtils.toBean(singleSettingDO, PriceSingleSettingRespVO.class);
         Map<Long, PriceSingleSettingRespVO> settingRespVOMap = CollectionUtils.convertMap(priceSingleSettingRespVOS, PriceSingleSettingRespVO::getRoomModelId);
+
+        List<Long> roomModelIds = CollectionUtils.convertList(priceRoomModelRespVOS, item -> item.getRoomModelId());
+        List<ResourceRoomModelDO> roomModelDOS = roomModelService.getList(roomModelIds);
+        Map<Long, ResourceRoomModelDO> resourceRoomModelDOMap = CollectionUtils.convertMap(roomModelDOS, item -> item.getId());
         priceRoomModelRespVOS.stream().forEach(item -> {
             item.setSingleSetting(settingRespVOMap.get(item.getRoomModelId()));
+            if(resourceRoomModelDOMap.get(item.getRoomModelId()) != null) {
+                item.setRoomModel(BeanUtils.toBean(resourceRoomModelDOMap.get(item.getRoomModelId()), ResourceRoomModelRespVO.class));
+            }
         });
         respVO.setRoomModelList(priceRoomModelRespVOS);
         List<PriceFloorDO> floorDOList = priceFloorService.getListByObjectId(id);

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

@@ -7,10 +7,7 @@ import com.yc.ship.module.product.controller.admin.pricetemplate.vo.*;
 import com.yc.ship.module.product.controller.admin.pricevoyage.vo.PriceVoyageRespVO;
 import com.yc.ship.module.product.controller.admin.voyage.vo.VoyageCalendarReqVO;
 import com.yc.ship.module.product.controller.admin.voyage.vo.VoyageRespVO;
-import com.yc.ship.module.product.controller.app.voyage.vo.AppRoomModelPriceRespVO;
-import com.yc.ship.module.product.controller.app.voyage.vo.AppVoyageCalendarPriceReqVO;
-import com.yc.ship.module.product.controller.app.voyage.vo.AppVoyageCalendarPriceRespVO;
-import com.yc.ship.module.product.controller.app.voyage.vo.AppVoyageRespVO;
+import com.yc.ship.module.product.controller.app.voyage.vo.*;
 import com.yc.ship.module.product.dal.dataobject.pricearea.PriceAreaDO;
 import com.yc.ship.module.product.dal.dataobject.pricefloor.PriceFloorDO;
 import com.yc.ship.module.product.dal.dataobject.priceroommodel.PriceRoomModelDO;
@@ -28,7 +25,10 @@ import com.yc.ship.module.product.service.voyage.VoyageService;
 import com.yc.ship.module.resource.api.route.RouteApi;
 import com.yc.ship.module.resource.api.route.dto.RouteRespDTO;
 import com.yc.ship.module.resource.api.ship.ShipApi;
+import com.yc.ship.module.resource.controller.admin.roommodel.vo.ResourceRoomModelRespVO;
+import com.yc.ship.module.resource.dal.dataobject.roommodel.ResourceRoomModelDO;
 import com.yc.ship.module.resource.dal.dataobject.ship.ResourceShipDO;
+import com.yc.ship.module.resource.service.roommodel.ResourceRoomModelService;
 import com.yc.ship.module.resource.service.ship.ResourceShipService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -82,6 +82,9 @@ public class AppVoyageController {
     @Resource
     private PriceSpuService priceSpuService;
 
+    @Resource
+    private ResourceRoomModelService roomModelService;
+
 
 
     @GetMapping("/list-calendar")
@@ -156,4 +159,34 @@ public class AppVoyageController {
         return success(respVO);
     }
 
+    @GetMapping("/get-by-voyage-id-new")
+    @Operation(summary = "通过航次ID获得航次价格")
+    public CommonResult<AppPriceVoyageRespVO> getByVoyageIdNew(@RequestParam("voyageId") Long voyageId, @RequestParam("roomModelId") Long roomModelId) {
+        PriceVoyageDO priceVoyage = priceVoyageService.getByVoyageId(voyageId);
+        if(priceVoyage == null) {
+            throw exception(ErrorCodeConstants.PRICE_VOYAGE_NOT_EXISTS);
+        }
+        Long id = priceVoyage.getId();
+        AppPriceVoyageRespVO respVO = BeanUtils.toBean(priceVoyage, AppPriceVoyageRespVO.class);
+        PriceRoomModelDO roomModelDO = priceRoomModelService.getListByObjectIdAndRoomModelId(id, roomModelId);
+        if(roomModelDO != null) {
+            PriceRoomModelRespVO priceRoomModelRespVO = BeanUtils.toBean(roomModelDO, PriceRoomModelRespVO.class);
+            PriceSingleSettingDO singleSettingDO = priceSingleSettingService.getByObjectIdAndRoomModelId(id, roomModelId);
+            priceRoomModelRespVO.setSingleSetting(BeanUtils.toBean(singleSettingDO, PriceSingleSettingRespVO.class));
+            respVO.setPriceRoomModel(priceRoomModelRespVO);
+        }
+        ResourceRoomModelDO roomModel = roomModelService.getRoomModel(roomModelId);
+        respVO.setRoomModel(BeanUtils.toBean(roomModel, ResourceRoomModelRespVO.class));
+        List<PriceFloorDO> floorDOList = priceFloorService.getListByObjectId(id);
+        respVO.setFloorList(BeanUtils.toBean(floorDOList, PriceFloorRespVO.class));
+        List<PriceAreaDO> areaList = priceAreaService.getListByObjectId(id);
+        respVO.setAreaList(BeanUtils.toBean(areaList, PriceAreaRespVO.class));
+        List<PriceCountryRespVO> countryList = priceAreaService.getCountryPriceByObjectId(id);
+        respVO.setCountryList(countryList);
+        //附加产品
+        List<PriceSpuRespVO> spuList = priceSpuService.getListByObjectId(id);
+        respVO.setSpuList(spuList);
+        return success(respVO);
+    }
+
 }

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

@@ -0,0 +1,90 @@
+package com.yc.ship.module.product.controller.app.voyage.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.yc.ship.framework.excel.core.annotations.DictFormat;
+import com.yc.ship.framework.excel.core.convert.DictConvert;
+import com.yc.ship.module.product.controller.admin.pricetemplate.vo.*;
+import com.yc.ship.module.resource.controller.admin.roommodel.vo.ResourceRoomModelRespVO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Schema(description = "APP端 - 航次价格 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class AppPriceVoyageRespVO {
+
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "15671")
+    @ExcelProperty("ID")
+    private Long id;
+
+    @Schema(description = "模板名称", example = "王五")
+    @ExcelProperty("模板名称")
+    private String name;
+
+    @Schema(description = "游轮ID", example = "11190")
+    @ExcelProperty("游轮ID")
+    private Long shipId;
+
+    @Schema(description = "游轮名称", example = "王五")
+    @ExcelProperty("游轮名称")
+    private String shipName;
+
+    @Schema(description = "航线ID", example = "18479")
+    @ExcelProperty("航线ID")
+    private Long routeId;
+
+    @Schema(description = "航线名称", example = "王五")
+    @ExcelProperty("航线名称")
+    private String routeName;
+
+    @Schema(description = "价格模板ID", example = "27165")
+    @ExcelProperty("价格模板ID")
+    private Long templateId;
+
+    @Schema(description = "航次ID", example = "1860")
+    @ExcelProperty("航次ID")
+    private Long voyageId;
+
+    @Schema(description = "航次名称", example = "王五")
+    @ExcelProperty("航次名称")
+    private String voyageName;
+
+    @Schema(description = "价格模式（字典）")
+    @ExcelProperty(value = "价格模式（字典）", converter = DictConvert.class)
+    @DictFormat("product_price_model") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
+    private Integer priceMode;
+
+    @Schema(description = "有效期")
+    @ExcelProperty("有效期")
+    private LocalDateTime validateTime;
+
+    @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @ExcelProperty("状态")
+    private Integer status;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "房型价格系数")
+    private PriceRoomModelRespVO priceRoomModel;
+
+    private ResourceRoomModelRespVO roomModel;
+
+    @Schema(description = "楼层价格系数")
+    private List<PriceFloorRespVO> floorList;
+
+    @Schema(description = "区域价格")
+    private List<PriceAreaRespVO> areaList;
+
+    @Schema(description = "国家价格")
+    private List<PriceCountryRespVO> countryList;
+
+    @Schema(description = "附加产品设置")
+    private List<PriceSpuRespVO> spuList;
+
+}

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/dal/mysql/priceroommodel/PriceRoomModelMapper.java

@@ -25,4 +25,10 @@ public interface PriceRoomModelMapper extends BaseMapperX<PriceRoomModelDO> {
                 .eqIfPresent(PriceRoomModelDO::getObjectId, objectId));
     }
 
+    default PriceRoomModelDO selectListByObjectIdAndRoomModelId(Long id, Long roomModelId) {
+        return selectOne(new LambdaQueryWrapperX<PriceRoomModelDO>()
+                .eqIfPresent(PriceRoomModelDO::getObjectId, id)
+                .eqIfPresent(PriceRoomModelDO::getRoomModelId, roomModelId)
+                .last("limit 1"));
+    }
 }

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/dal/mysql/pricesinglesetting/PriceSingleSettingMapper.java

@@ -24,4 +24,10 @@ public interface PriceSingleSettingMapper extends BaseMapperX<PriceSingleSetting
                 .eqIfPresent(PriceSingleSettingDO::getObjectId, objectId));
     }
 
+    default PriceSingleSettingDO selectByObjectIdAndRoomModelId(Long objectId, Long roomModelId) {
+        return selectOne(new LambdaQueryWrapperX<PriceSingleSettingDO>()
+                .eqIfPresent(PriceSingleSettingDO::getObjectId, objectId)
+                .eqIfPresent(PriceSingleSettingDO::getRoomModelId, roomModelId)
+                .last("limit 1"));
+    }
 }

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/service/priceroommodel/PriceRoomModelService.java

@@ -33,4 +33,11 @@ public interface PriceRoomModelService {
      */
     List<PriceRoomModelDO> getListByObjectId(Long objectId);
 
+    /**
+     * 获取房型的价格
+     * @param id
+     * @param roomModelId
+     * @return
+     */
+    PriceRoomModelDO getListByObjectIdAndRoomModelId(Long id, Long roomModelId);
 }

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/service/priceroommodel/PriceRoomModelServiceImpl.java

@@ -37,5 +37,10 @@ public class PriceRoomModelServiceImpl implements PriceRoomModelService {
         return priceRoomModelMapper.selectListByObjectId(objectId);
     }
 
+    @Override
+    public PriceRoomModelDO getListByObjectIdAndRoomModelId(Long id, Long roomModelId) {
+        return priceRoomModelMapper.selectListByObjectIdAndRoomModelId(id, roomModelId);
+    }
+
 
 }

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/service/pricesinglesetting/PriceSingleSettingService.java

@@ -36,4 +36,10 @@ public interface PriceSingleSettingService {
      */
     List<PriceSingleSettingDO> getByObjectId(Long objectId);
 
+    /**
+     * 查询房型的单人票设置
+     * @param id
+     * @return
+     */
+    PriceSingleSettingDO getByObjectIdAndRoomModelId(Long objectId, Long roomModelId);
 }

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/service/pricesinglesetting/PriceSingleSettingServiceImpl.java

@@ -39,5 +39,10 @@ public class PriceSingleSettingServiceImpl implements PriceSingleSettingService
         return priceSingleSettingMapper.selectByObjectId(objectId);
     }
 
+    @Override
+    public PriceSingleSettingDO getByObjectIdAndRoomModelId(Long objectId, Long roomModelId) {
+        return priceSingleSettingMapper.selectByObjectIdAndRoomModelId(objectId, roomModelId);
+    }
+
 
 }

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

@@ -130,6 +130,24 @@ public class ResourceRoomModelRespVO {
     @Schema(description = "可加人数,成人和儿童最多可加人数")
     private Integer addNum;
 
+    /**
+     * 最大入住人数
+     */
+    @Schema(description = "最大入住人数")
+    private Integer maxNum;
+
+    /**
+     * 最大入住成人数
+     */
+    @Schema(description = "最大入住成人数")
+    private Integer maxAdultNum;
+
+    /**
+     * 最大入住儿童人数
+     */
+    @Schema(description = "最大入住儿童人数")
+    private Integer maxChildNum;
+
     public void setFloorsNumStr(String floorsNum) {
         String[] split = floorsNum.split(",");
         this.floorsNumStr = Arrays.stream(split).map(element -> element + "F").collect(Collectors.joining( "，"));

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

@@ -87,4 +87,22 @@ public class ResourceRoomModelSaveReqVO {
     @Schema(description = "可加人数,成人和儿童最多可加人数")
     private Integer addNum;
 
+    /**
+     * 最大入住人数
+     */
+    @Schema(description = "最大入住人数")
+    private Integer maxNum;
+
+    /**
+     * 最大入住成人数
+     */
+    @Schema(description = "最大入住成人数")
+    private Integer maxAdultNum;
+
+    /**
+     * 最大入住儿童人数
+     */
+    @Schema(description = "最大入住儿童人数")
+    private Integer maxChildNum;
+
 }

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/dal/dataobject/roommodel/ResourceRoomModelDO.java

@@ -115,4 +115,19 @@ public class ResourceRoomModelDO extends TenantBaseDO {
      */
     private Integer addNum;
 
+    /**
+     * 最大入住人数
+     */
+    private Integer maxNum;
+
+    /**
+     * 最大入住成人数
+     */
+    private Integer maxAdultNum;
+
+    /**
+     * 最大入住儿童人数
+     */
+    private Integer maxChildNum;
+
 }