浏览代码

分销商折扣管理

lishiqiang 1 月之前
父节点
当前提交
66959c03b3

+ 2 - 1
ship-module-otc/ship-module-otc-biz/src/main/java/com/yc/ship/module/otc/controller/admin/otclevel/vo/OtcLevelRespVO.java

@@ -6,6 +6,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Schema(description = "管理后台 - 旅行社等级管理 Response VO")
 @Data
@@ -30,7 +31,7 @@ public class OtcLevelRespVO {
 
     @Schema(description = "适用房型字典hotel_room_type", example = "2")
     @ExcelProperty("适用房型字典hotel_room_type")
-    private Integer hotelRoomType;
+    private List<Long> hotelRoomType;
 
     @Schema(description = "创建时间")
     @ExcelProperty("创建时间")

+ 3 - 1
ship-module-otc/ship-module-otc-biz/src/main/java/com/yc/ship/module/otc/controller/admin/otclevel/vo/OtcLevelSaveReqVO.java

@@ -3,6 +3,8 @@ package com.yc.ship.module.otc.controller.admin.otclevel.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.util.List;
+
 @Schema(description = "管理后台 - 旅行社等级管理新增/修改 Request VO")
 @Data
 public class OtcLevelSaveReqVO {
@@ -20,6 +22,6 @@ public class OtcLevelSaveReqVO {
     private String remark;
 
     @Schema(description = "适用房型字典hotel_room_type", example = "2")
-    private Integer hotelRoomType;
+    private List<Long> hotelRoomType;
 
 }

+ 1 - 1
ship-module-otc/ship-module-otc-biz/src/main/java/com/yc/ship/module/otc/dal/dataobject/otclevel/OtcLevelDO.java

@@ -41,6 +41,6 @@ public class OtcLevelDO extends BaseDO {
     /**
      * 适用房型字典hotel_room_type
      */
-    private Integer hotelRoomType;
+    private String hotelRoomType;
 
 }

+ 1 - 0
ship-module-otc/ship-module-otc-biz/src/main/java/com/yc/ship/module/otc/service/otclevel/OtcLevelServiceImpl.java

@@ -35,6 +35,7 @@ public class OtcLevelServiceImpl implements OtcLevelService {
         // 插入
         OtcLevelDO level = BeanUtils.toBean(createReqVO, OtcLevelDO.class);
         level.setId(IdWorker.getId(level));
+        level.setHotelRoomType(createReqVO.getHotelRoomType().toString()) ;
         levelMapper.insert(level);
         // 返回
         return level.getId();

+ 1 - 0
ship-server-web/src/main/resources/application.yaml

@@ -299,6 +299,7 @@ yudao:
       - system_notify_template
       - system_sequence_number
       - product_supplier_category
+      - distributor_discount
     ignore-caches:
       - user_role_ids
       - permission_menu_ids