Browse Source

feat: 增加字段预定须知,登船须知,儿童预定说明

luofeiyun 2 weeks ago
parent
commit
b48677b5b9

+ 18 - 0
ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/voyage/vo/VoyageRespVO.java

@@ -114,4 +114,22 @@ public class VoyageRespVO {
 
     @Schema(description = "线路名称")
     private String routeName;
+
+    /**
+     * 预订须知
+     */
+    @Schema(description = "预订须知")
+    private String bookingNotice;
+
+    /**
+     * 登船须知
+     */
+    @Schema(description = "登船须知")
+    private String boardingNotice;
+
+    /**
+     * 儿童预定说明
+     */
+    @Schema(description = "儿童预定说明")
+    private String childBookingNotice;
 }

+ 20 - 1
ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/voyage/vo/VoyageSaveBatchReqVO.java

@@ -57,9 +57,28 @@ public class VoyageSaveBatchReqVO {
     @Schema(description = "产品介绍")
     private String introduce;
 
-    @Schema(description = "登船须知")
+    @Deprecated
+    @Schema(description = "登船须知(弃用)")
     private String notice;
 
     @Schema(description = "价格模板ID", example = "1")
     private Long templateId;
+
+    /**
+     * 预订须知
+     */
+    @Schema(description = "预订须知")
+    private String bookingNotice;
+
+    /**
+     * 登船须知
+     */
+    @Schema(description = "登船须知")
+    private String boardingNotice;
+
+    /**
+     * 儿童预定说明
+     */
+    @Schema(description = "儿童预定说明")
+    private String childBookingNotice;
 }

+ 20 - 1
ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/voyage/vo/VoyageSaveReqVO.java

@@ -67,7 +67,26 @@ public class VoyageSaveReqVO {
     @Schema(description = "产品介绍")
     private String introduce;
 
-    @Schema(description = "登船须知")
+    @Deprecated
+    @Schema(description = "登船须知(弃用)")
     private String notice;
 
+    /**
+     * 预订须知
+     */
+    @Schema(description = "预订须知")
+    private String bookingNotice;
+
+    /**
+     * 登船须知
+     */
+    @Schema(description = "登船须知")
+    private String boardingNotice;
+
+    /**
+     * 儿童预定说明
+     */
+    @Schema(description = "儿童预定说明")
+    private String childBookingNotice;
+
 }

+ 16 - 1
ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/dal/dataobject/voyage/VoyageDO.java

@@ -113,8 +113,23 @@ public class VoyageDO extends TenantBaseDO {
      */
     private String introduce;
     /**
-     * 登船须知
+     * 登船须知(弃用)
      */
     private String notice;
 
+    /**
+     * 预订须知
+     */
+    private String bookingNotice;
+
+    /**
+     * 登船须知
+     */
+    private String boardingNotice;
+
+    /**
+     * 儿童预定说明
+     */
+    private String childBookingNotice;
+
 }

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

@@ -335,6 +335,9 @@ public class VoyageServiceImpl implements VoyageService {
             voyageDO.setVenue(createReqVO.getVenue());
             voyageDO.setIntroduce(createReqVO.getIntroduce());
             voyageDO.setNotice(createReqVO.getNotice());
+            voyageDO.setBoardingNotice(createReqVO.getBoardingNotice());
+            voyageDO.setChildBookingNotice(createReqVO.getChildBookingNotice());
+            voyageDO.setBookingNotice(createReqVO.getBookingNotice());
             voyageDOList.add(voyageDO);
             if(priceTemplate != null) { //有价格模板就生成航次价格
                 PriceVoyageSaveReqVO priceVoyageSaveReqVO = new PriceVoyageSaveReqVO();

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

@@ -94,4 +94,22 @@ public class ResourceRouteRespVO {
     @Schema(description = "航线详情")
     private String routeDetail;
 
+    /**
+     * 预订须知
+     */
+    @Schema(description = "预订须知")
+    private String bookingNotice;
+
+    /**
+     * 登船须知
+     */
+    @Schema(description = "登船须知")
+    private String boardingNotice;
+
+    /**
+     * 儿童预定说明
+     */
+    @Schema(description = "儿童预定说明")
+    private String childBookingNotice;
+
 }

+ 18 - 0
ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/controller/admin/route/vo/ResourceRouteSaveReqVO.java

@@ -67,4 +67,22 @@ public class ResourceRouteSaveReqVO {
 
     @Schema(description = "航线详情")
     private String routeDetail;
+
+    /**
+     * 预订须知
+     */
+    @Schema(description = "预订须知")
+    private String bookingNotice;
+
+    /**
+     * 登船须知
+     */
+    @Schema(description = "登船须知")
+    private String boardingNotice;
+
+    /**
+     * 儿童预定说明
+     */
+    @Schema(description = "儿童预定说明")
+    private String childBookingNotice;
 }

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

@@ -109,4 +109,19 @@ public class ResourceRouteDO extends BaseDO {
      */
     private String routeDetail;
 
+    /**
+     * 预订须知
+     */
+    private String bookingNotice;
+
+    /**
+     * 登船须知
+     */
+    private String boardingNotice;
+
+    /**
+     * 儿童预定说明
+     */
+    private String childBookingNotice;
+
 }