feat: 添加部分字段

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

@@ -124,6 +124,12 @@ public class ResourceRoomModelRespVO {
     @Schema(description = "可加儿童数（和成人二选一）")
     private Integer addChildNum;
 
+    /**
+     * 可加人数
+     */
+    @Schema(description = "可加人数,成人和儿童最多可加人数")
+    private Integer addNum;
+
     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

@@ -44,7 +44,7 @@ public class ResourceRoomModelSaveReqVO {
     @Schema(description = "成本价(元/晚)", example = "1742")
     private BigDecimal price;
 
-    @Schema(description = "是否套房")
+    @Schema(description = "是否允许拼房")
     private Integer suite;
 
     @Schema(description = "房型介绍")
@@ -81,4 +81,10 @@ public class ResourceRoomModelSaveReqVO {
     @Schema(description = "可加儿童数（和成人二选一）")
     private Integer addChildNum;
 
+    /**
+     * 可加人数
+     */
+    @Schema(description = "可加人数,成人和儿童最多可加人数")
+    private Integer addNum;
+
 }

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

@@ -91,4 +91,7 @@ public class ResourceRouteRespVO {
     @Schema(description = "航线图片")
     private String routeImg;
 
+    @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

@@ -64,4 +64,7 @@ public class ResourceRouteSaveReqVO {
 
     @Schema(description = "航线图片")
     private String routeImg;
+
+    @Schema(description = "航线详情")
+    private String routeDetail;
 }

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

@@ -22,6 +22,9 @@ public class ResourceShipRespVO {
     @ExcelProperty("游轮名称")
     private String name;
 
+    @Schema(description = "游轮简称")
+    private String shortName;
+
     @Schema(description = "游轮编码")
     @ExcelProperty("游轮编码")
     private String code;

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

@@ -15,6 +15,9 @@ public class ResourceShipSaveReqVO {
     @Schema(description = "游轮名称", example = "王五")
     private String name;
 
+    @Schema(description = "游轮简称", example = "王五")
+    private String shortName;
+
     @Schema(description = "游轮编码")
     private String code;
 

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/controller/app/scenic/AppResourceScenicController.java

@@ -0,0 +1,74 @@
+package com.yc.ship.module.resource.controller.app.scenic;
+
+import com.yc.ship.framework.common.enums.CommonStatusEnum;
+import com.yc.ship.framework.common.pojo.CommonResult;
+import com.yc.ship.framework.common.pojo.PageResult;
+import com.yc.ship.framework.common.util.collection.CollectionUtils;
+import com.yc.ship.framework.common.util.object.BeanUtils;
+import com.yc.ship.framework.ip.core.utils.AreaUtils;
+import com.yc.ship.module.resource.controller.admin.scenic.vo.ResourceScenicPageReqVO;
+import com.yc.ship.module.resource.controller.app.scenic.vo.AppResourceScenicRespVO;
+import com.yc.ship.module.resource.dal.dataobject.dock.ResourceDockDO;
+import com.yc.ship.module.resource.dal.dataobject.scenic.ResourceScenicDO;
+import com.yc.ship.module.resource.service.dock.ResourceDockService;
+import com.yc.ship.module.resource.service.scenic.ResourceScenicService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Map;
+
+import static com.yc.ship.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "景区 APP - 景区接口")
+@RestController
+@RequestMapping("/resource/scenic")
+@Validated
+public class AppResourceScenicController {
+    @Resource
+    private ResourceScenicService scenicService;
+
+    @Resource
+    private ResourceDockService dockService;
+    @GetMapping("/page")
+    @Operation(summary = "获得景区管理分页")
+    public CommonResult<PageResult<AppResourceScenicRespVO>> getScenicPage(@Valid ResourceScenicPageReqVO pageReqVO) {
+        pageReqVO.setStatus(CommonStatusEnum.ENABLE.getStatus());
+        PageResult<ResourceScenicDO> pageResult = scenicService.getScenicPage(pageReqVO);
+        PageResult<AppResourceScenicRespVO> page = BeanUtils.toBean(pageResult, AppResourceScenicRespVO.class);
+        List<AppResourceScenicRespVO> list = page.getList();
+        List<Long> dockIds = CollectionUtils.convertList(list, AppResourceScenicRespVO::getDockId);
+        List<ResourceDockDO> dockList = dockService.getList(dockIds);
+        Map<Long, ResourceDockDO> longResourceDockDOMap = CollectionUtils.convertMap(dockList, ResourceDockDO::getId);
+        list.stream().forEach(item -> {
+            item.setDockName(longResourceDockDOMap.get(item.getDockId()).getName());
+            if(item.getCountyId() != null) {
+                String area = AreaUtils.format(item.getCountyId());
+                item.setArea(area);
+            }else if(item.getCityId() != null) {
+                String area = AreaUtils.format(item.getCityId());
+                item.setArea(area);
+            }else if(item.getProvinceId() != null) {
+                String area = AreaUtils.format(item.getProvinceId());
+                item.setArea(area);
+            }
+        });
+        return success(page);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得景区详情")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    public CommonResult<AppResourceScenicRespVO> getScenic(@RequestParam("id") Long id) {
+        ResourceScenicDO scenic = scenicService.getScenic(id);
+        return success(BeanUtils.toBean(scenic, AppResourceScenicRespVO.class));
+    }
+}

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/controller/app/scenic/vo/AppResourceScenicRespVO.java

@@ -0,0 +1,10 @@
+package com.yc.ship.module.resource.controller.app.scenic.vo;
+
+import com.yc.ship.module.resource.controller.admin.scenic.vo.ResourceScenicRespVO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "景区APP - 景区 Response VO")
+@Data
+public class AppResourceScenicRespVO extends ResourceScenicRespVO {
+}

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/controller/app/ship/AppResourceShipController.java

@@ -3,6 +3,7 @@ package com.yc.ship.module.resource.controller.app.ship;
 import com.yc.ship.framework.common.pojo.CommonResult;
 import com.yc.ship.framework.common.util.object.BeanUtils;
 import com.yc.ship.module.resource.controller.admin.ship.vo.ResourceShipRespVO;
+import com.yc.ship.module.resource.controller.app.ship.vo.AppResourceShipRespVO;
 import com.yc.ship.module.resource.dal.dataobject.ship.ResourceShipDO;
 import com.yc.ship.module.resource.service.ship.ResourceShipService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -28,16 +29,16 @@ public class AppResourceShipController {
 
     @GetMapping("/list-simple")
     @Operation(summary = "获取游轮列表（下拉筛选用）")
-    public CommonResult<List<ResourceShipRespVO>> getShipListSimple() {
+    public CommonResult<List<AppResourceShipRespVO>> getShipListSimple() {
         List<ResourceShipDO> list = shipService.getListSimple();
-        return success(BeanUtils.toBean(list, ResourceShipRespVO.class));
+        return success(BeanUtils.toBean(list, AppResourceShipRespVO.class));
     }
 
     @GetMapping("/detail")
     @Operation(summary = "获取游轮详情")
-    public CommonResult<ResourceShipRespVO> getShipDetail(Long id) {
+    public CommonResult<AppResourceShipRespVO> getShipDetail(Long id) {
         ResourceShipDO ship = shipService.getShip(id);
-        return success(BeanUtils.toBean(ship, ResourceShipRespVO.class));
+        return success(BeanUtils.toBean(ship, AppResourceShipRespVO.class));
     }
 
 }

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

@@ -1,9 +1,10 @@
 package com.yc.ship.module.resource.controller.app.ship.vo;
 
+import com.yc.ship.module.resource.controller.admin.ship.vo.ResourceShipRespVO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 @Schema(description = "APP 游轮 - 游轮 Response VO")
 @Data
-public class AppResourceShipRespVo {
+public class AppResourceShipRespVO extends ResourceShipRespVO {
 }

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

@@ -1,6 +1,7 @@
 package com.yc.ship.module.resource.dal.dataobject.roommodel;
 
 import com.yc.ship.framework.tenant.core.db.TenantBaseDO;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.util.*;
 import java.math.BigDecimal;
@@ -109,4 +110,9 @@ public class ResourceRoomModelDO extends TenantBaseDO {
      */
     private Integer addChildNum;
 
+    /**
+     * 可加人数
+     */
+    private Integer addNum;
+
 }

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

@@ -1,5 +1,6 @@
 package com.yc.ship.module.resource.dal.dataobject.route;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.util.*;
 import java.time.LocalDateTime;
@@ -103,4 +104,9 @@ public class ResourceRouteDO extends BaseDO {
      */
     private String routeImg;
 
+    /**
+     * 航线详情
+     */
+    private String routeDetail;
+
 }

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

@@ -32,6 +32,11 @@ public class ResourceShipDO extends TenantBaseDO {
      * 游轮名称
      */
     private String name;
+
+    /**
+     * 游轮简称
+     */
+    private String shortName;
     /**
      * 游轮编码
      */