Merge branch 'main' of http://47.98.207.247:3000/lsq/ship-ota-server

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/voyage/VoyageController.java

@@ -106,6 +106,14 @@ public class VoyageController {
         return success(BeanUtils.toBean(list, VoyageRespVO.class));
     }
 
+    //根据游轮ID获取上架的航次列表
+    @GetMapping("/on-shelf-list-by-ship-id")
+    @Operation(summary = "根据游轮ID获取上架的航次列表,给旅行社下单时调用")
+    public CommonResult<List<VoyageRespVO>> getOnShelfListByShipId(@RequestParam("shipId") Long shipId) {
+        List<VoyageDO> list = voyageService.getOnShelfListByShipId(shipId);
+        return success(BeanUtils.toBean(list, VoyageRespVO.class));
+    }
+
     @GetMapping("/export-excel")
     @Operation(summary = "导出航次管理 Excel")
     @PreAuthorize("@ss.hasPermission('product:voyage:export')")

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

@@ -42,4 +42,11 @@ public interface VoyageMapper extends BaseMapperX<VoyageDO> {
                 .eq(VoyageDO::getShelfStatus, VoyageShelfStatusEnum.ON_SHELF.getValue())
                 .orderByAsc(VoyageDO::getCreateTime));
     }
+
+    default List<VoyageDO> selectOnShelfListByShipId(Long shipId) {
+        return selectList(new LambdaQueryWrapperX<VoyageDO>()
+                .eq(VoyageDO::getShipId, shipId)
+                .eq(VoyageDO::getShelfStatus, VoyageShelfStatusEnum.ON_SHELF.getValue())
+                .orderByAsc(VoyageDO::getCreateTime));
+    }
 }

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

@@ -60,4 +60,11 @@ public interface VoyageService {
     List<VoyageDO> getList(List<Long> ids);
 
     Map<Long, VoyageDO> getListMap(List<Long> ids);
+
+    /**
+     *  根据游轮ID获取航次列表
+     * @param shipId
+     * @return
+     */
+    List<VoyageDO> getOnShelfListByShipId(Long shipId);
 }

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

@@ -161,4 +161,9 @@ public class VoyageServiceImpl implements VoyageService {
         return CollectionUtils.convertMap(list, VoyageDO::getId);
     }
 
+    @Override
+    public List<VoyageDO> getOnShelfListByShipId(Long shipId) {
+        return voyageMapper.selectOnShelfListByShipId(shipId);
+    }
+
 }