添加房型排序

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

@@ -159,6 +159,9 @@ public class ResourceRoomModelRespVO {
     @Schema(description = "房型面积")
     private String roomArea;
 
+    @Schema(description = "排序")
+    private Long sort;
+
     @Schema(description = "房型服务设施")
     private List<ResourceRoomModelServiceRespVO> services;
 

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

@@ -109,6 +109,9 @@ public class ResourceRoomModelSaveReqVO {
     @Schema(description = "最大入住儿童人数")
     private Integer maxChildNum;
 
+    @Schema(description = "排序")
+    private Long sort;
+
     @Schema(description = "是否可售", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "是否可售不能为空")
     private Integer canSale;

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

@@ -148,6 +148,11 @@ public class ResourceRoomModelDO extends TenantBaseDO {
      */
     private String roomArea;
 
+    /**
+     * 排序
+     */
+    private Long sort;
+
     public String getShowName() {
         if(StringUtils.isNotBlank(shortName)) {
             return shortName;

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/dal/mysql/roommodel/ResourceRoomModelMapper.java

@@ -34,7 +34,8 @@ public interface ResourceRoomModelMapper extends BaseMapperX<ResourceRoomModelDO
     default List<ResourceRoomModelDO> selectListByShipId(String shipId) {
         return selectList(new LambdaQueryWrapperX<ResourceRoomModelDO>()
                 .eqIfPresent(ResourceRoomModelDO::getShipId, shipId)
-                .eq(ResourceRoomModelDO::getStatus, CommonStatusEnum.ENABLE.getStatus()));
+                .eq(ResourceRoomModelDO::getStatus, CommonStatusEnum.ENABLE.getStatus())
+                .orderByAsc(ResourceRoomModelDO::getSort));
     }
 
     default List<ResourceRoomModelDO> selectRoomModelCanSaleListByShipId(String shipId) {