fix: 航次价格增加基准价字段

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

@@ -53,7 +53,7 @@ public class PriceTemplateRespVO {
     private Integer status;
 
     @Schema(description = "基准价格", example = "10043")
-    private BigDecimal price;
+    private BigDecimal basicPrice;
 
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")

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

@@ -40,7 +40,7 @@ public class PriceTemplateSaveReqVO {
     private Integer status;
 
     @Schema(description = "基准价格", example = "10043")
-    private BigDecimal price;
+    private BigDecimal basicPrice;
 
     @Schema(description = "房型价格系数")
     private List<PriceRoomModelDO> roomModelList;

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

@@ -8,6 +8,7 @@ import com.yc.ship.module.product.controller.admin.pricetemplate.vo.*;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -69,6 +70,10 @@ public class PriceVoyageRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
+    @Schema(description = "基准价格")
+    @ExcelProperty("基准价格")
+    private BigDecimal basicPrice;
+
     @Schema(description = "房型价格系数")
     private List<PriceRoomModelRespVO> roomModelList;
 

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

@@ -1,5 +1,6 @@
 package com.yc.ship.module.product.controller.admin.pricevoyage.vo;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 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;
@@ -9,6 +10,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -44,6 +46,10 @@ public class PriceVoyageSaveReqVO {
     @NotNull(message = "状态不能为空")
     private Integer status;
 
+    @Schema(description = "基准价格")
+    @ExcelProperty("基准价格")
+    private BigDecimal basicPrice;
+
     @Schema(description = "房型价格系数")
     private List<PriceRoomModelDO> roomModelList;
 

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

@@ -8,6 +8,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.admin.voyagestockdistributeNew.vo.QueryCanSelectRoomListNewReqVO;
 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;
@@ -23,6 +24,8 @@ import com.yc.ship.module.product.service.pricesinglesetting.PriceSingleSettingS
 import com.yc.ship.module.product.service.pricespu.PriceSpuService;
 import com.yc.ship.module.product.service.pricevoyage.PriceVoyageService;
 import com.yc.ship.module.product.service.voyage.VoyageService;
+import com.yc.ship.module.product.service.voyagestockdistribute.VoyageStockDistributeNewService;
+import com.yc.ship.module.resource.api.room.dto.RoomRespDTO;
 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;
@@ -34,12 +37,10 @@ import com.yc.ship.module.resource.service.ship.ResourceShipService;
 import io.swagger.v3.oas.annotations.Operation;
 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 org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -86,6 +87,9 @@ public class AppVoyageController {
     @Resource
     private ResourceRoomModelService roomModelService;
 
+    @Resource
+    private VoyageStockDistributeNewService voyageStockDistributeNewService;
+
 
 
     @GetMapping("/list-calendar")
@@ -194,4 +198,12 @@ public class AppVoyageController {
         return success(respVO);
     }
 
+    //获取可以选择的房间号
+    @GetMapping("/getCanSelectRoomList")
+    @Operation(summary = "获取可以选择的房间号")
+    public CommonResult<List<RoomRespDTO>> getCanSelectRoomList(@RequestBody QueryCanSelectRoomListNewReqVO reqVO) {
+        List<RoomRespDTO> list = voyageStockDistributeNewService.getCanSelectRoomList(reqVO);
+        return success(list);
+    }
+
 }

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

@@ -9,6 +9,7 @@ import com.yc.ship.module.resource.controller.admin.roommodel.vo.ResourceRoomMod
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -66,6 +67,10 @@ public class AppPriceVoyageRespVO {
     @ExcelProperty("状态")
     private Integer status;
 
+    @Schema(description = "基准价格", example = "100")
+    @ExcelProperty("基准价格")
+    private BigDecimal price;
+
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/dal/dataobject/pricetemplate/PriceTemplateDO.java

@@ -63,6 +63,6 @@ public class PriceTemplateDO extends TenantBaseDO {
     /***
      * 基准价格
      */
-    private BigDecimal price;
+    private BigDecimal basicPrice;
 
 }

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/dal/dataobject/pricevoyage/PriceVoyageDO.java

@@ -8,6 +8,7 @@ import com.sun.xml.bind.v2.TODO;
 import com.yc.ship.framework.tenant.core.db.TenantBaseDO;
 import lombok.*;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 /**
@@ -65,4 +66,9 @@ public class PriceVoyageDO extends TenantBaseDO {
      */
     private Integer status;
 
+    /***
+     * 基准价格
+     */
+    private BigDecimal basicPrice;
+
 }