加床类型

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

@@ -40,6 +40,9 @@ public class PriceVoyagePageReqVO extends PageParam {
     @Schema(description = "状态", example = "1")
     private Integer status;
 
+    @Schema(description = "加床类型", example = "1")
+    private Integer jctype;
+
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;

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

@@ -65,6 +65,10 @@ public class PriceVoyageRespVO {
     @ExcelProperty("状态")
     private Integer status;
 
+    @Schema(description = "加床类型")
+    @ExcelProperty("加床类型")
+    private Integer jctype;
+
     @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/controller/admin/pricevoyage/vo/PriceVoyageSaveReqVO.java

@@ -44,6 +44,10 @@ public class PriceVoyageSaveReqVO {
     @NotNull(message = "状态不能为空")
     private Integer status;
 
+    @Schema(description = "加床类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotNull(message = "加床类型不能为空")
+    private Integer jctype;
+
     @Schema(description = "房型价格系数")
     private List<PriceRoomModelDO> roomModelList;
 

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

@@ -64,5 +64,9 @@ public class PriceVoyageDO extends TenantBaseDO {
      * 状态
      */
     private Integer status;
+    /***
+     * 加床类型 0：固定金额 1：百分比
+     */
+    private Integer jctype;
 
 }

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/dal/mysql/pricevoyage/PriceVoyageMapper.java

@@ -26,6 +26,7 @@ public interface PriceVoyageMapper extends BaseMapperX<PriceVoyageDO> {
                 .eqIfPresent(PriceVoyageDO::getPriceMode, reqVO.getPriceMode())
                 .betweenIfPresent(PriceVoyageDO::getValidateTime, reqVO.getValidateTime())
                 .eqIfPresent(PriceVoyageDO::getStatus, reqVO.getStatus())
+                .eqIfPresent(PriceVoyageDO::getJctype, reqVO.getJctype())
                 .betweenIfPresent(PriceVoyageDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(PriceVoyageDO::getId));
     }