Przeglądaj źródła

fix: 价格模板添加加系数字段

luofeiyun 1 miesiąc temu
rodzic
commit
bba2296cd7

+ 41 - 38
ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/pricetemplate/vo/PriceSingleSettingRespVO.java

@@ -26,17 +26,17 @@ public class PriceSingleSettingRespVO {
     @ExcelProperty("成人占床")
     private BigDecimal adultTake;
 
-    @Schema(description = "成人加床(套房)")
-    @ExcelProperty("成人加床(套房)")
-    private BigDecimal adultPlusSuite;
+//    @Schema(description = "成人加床(套房)")
+//    @ExcelProperty("成人加床(套房)")
+//    private BigDecimal adultPlusSuite;
 
     @Schema(description = "成人加床(非套房)")
     @ExcelProperty("成人加床(非套房)")
     private BigDecimal adultPlusNonSuite;
 
-    @Schema(description = "成人加床固定费用", example = "29706")
-    @ExcelProperty("成人加床固定费用")
-    private BigDecimal adultPlusPrice;
+//    @Schema(description = "成人加床固定费用", example = "29706")
+//    @ExcelProperty("成人加床固定费用")
+//    private BigDecimal adultPlusPrice;
 
     @Schema(description = "儿童不占床(非套房)")
     @ExcelProperty("儿童不占床(非套房)")
@@ -50,25 +50,25 @@ public class PriceSingleSettingRespVO {
     @ExcelProperty("儿童加床(非套房)")
     private BigDecimal childPlusNonSuite;
 
-    @Schema(description = "儿童加床固定费用(非套房)", example = "14198")
-    @ExcelProperty("儿童加床固定费用(非套房)")
-    private BigDecimal childPlusNonSuitePrice;
+//    @Schema(description = "儿童加床固定费用(非套房)", example = "14198")
+//    @ExcelProperty("儿童加床固定费用(非套房)")
+//    private BigDecimal childPlusNonSuitePrice;
 
-    @Schema(description = "儿童不占床(套房)")
-    @ExcelProperty("儿童不占床(套房)")
-    private BigDecimal childNonTakeSuite;
+//    @Schema(description = "儿童不占床(套房)")
+//    @ExcelProperty("儿童不占床(套房)")
+//    private BigDecimal childNonTakeSuite;
 
-    @Schema(description = "儿童占床(套房)")
-    @ExcelProperty("儿童占床(套房)")
-    private BigDecimal childTakeSuite;
+//    @Schema(description = "儿童占床(套房)")
+//    @ExcelProperty("儿童占床(套房)")
+//    private BigDecimal childTakeSuite;
+//
+//    @Schema(description = "儿童加床(套房)")
+//    @ExcelProperty("儿童加床(套房)")
+//    private BigDecimal childPlusSuite;
 
-    @Schema(description = "儿童加床(套房)")
-    @ExcelProperty("儿童加床(套房)")
-    private BigDecimal childPlusSuite;
-
-    @Schema(description = "儿童加床固定费用(套房)", example = "50")
-    @ExcelProperty("儿童加床固定费用(套房)")
-    private BigDecimal childPlusSuitePrice;
+//    @Schema(description = "儿童加床固定费用(套房)", example = "50")
+//    @ExcelProperty("儿童加床固定费用(套房)")
+//    private BigDecimal childPlusSuitePrice;
 
     @Schema(description = "婴儿不占床(非套房)")
     @ExcelProperty("婴儿不占床(非套房)")
@@ -82,29 +82,32 @@ public class PriceSingleSettingRespVO {
     @ExcelProperty("婴儿加床(非套房)")
     private BigDecimal babyPlusNonSuite;
 
-    @Schema(description = "婴儿加床固定费用(非套房)", example = "24173")
-    @ExcelProperty("婴儿加床固定费用(非套房)")
-    private BigDecimal babyPlusNonSuitePrice;
-
-    @Schema(description = "婴儿不占床(套房)")
-    @ExcelProperty("婴儿不占床(套房)")
-    private BigDecimal babyNonTakeSuite;
+//    @Schema(description = "婴儿加床固定费用(非套房)", example = "24173")
+//    @ExcelProperty("婴儿加床固定费用(非套房)")
+//    private BigDecimal babyPlusNonSuitePrice;
 
-    @Schema(description = "婴儿占床(套房)")
-    @ExcelProperty("婴儿占床(套房)")
-    private BigDecimal babyTakeSuite;
+//    @Schema(description = "婴儿不占床(套房)")
+//    @ExcelProperty("婴儿不占床(套房)")
+//    private BigDecimal babyNonTakeSuite;
 
-    @Schema(description = "婴儿加床(套房)")
-    @ExcelProperty("婴儿加床(套房)")
-    private BigDecimal babyPlusSuite;
+//    @Schema(description = "婴儿占床(套房)")
+//    @ExcelProperty("婴儿占床(套房)")
+//    private BigDecimal babyTakeSuite;
+//
+//    @Schema(description = "婴儿加床(套房)")
+//    @ExcelProperty("婴儿加床(套房)")
+//    private BigDecimal babyPlusSuite;
 
-    @Schema(description = "婴儿加床固定费用(套房)", example = "8147")
-    @ExcelProperty("婴儿加床固定费用(套房)")
-    private BigDecimal babyPlusSuitePrice;
+//    @Schema(description = "婴儿加床固定费用(套房)", example = "8147")
+//    @ExcelProperty("婴儿加床固定费用(套房)")
+//    private BigDecimal babyPlusSuitePrice;
 
     @Schema(description = "加床类型")
     @ExcelProperty("加床类型")
     private Integer jctype;
 
+    @Schema(description = "加系数")
+    private BigDecimal addRate;
+
 
 }

+ 5 - 0
ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/dal/dataobject/pricesinglesetting/PriceSingleSettingDO.java

@@ -130,4 +130,9 @@ public class PriceSingleSettingDO extends TenantBaseDO {
      */
     private Integer jctype;
 
+    /**
+     * 加系数
+     */
+    private BigDecimal addRate;
+
 }