Merge branch 'master' of http://49.4.53.36:3000/hotel/hotel-saas-backend

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/entity/CesRoomLayout.java

@@ -15,8 +15,8 @@ import lombok.experimental.Accessors;
  * 租户房型记录表
  * </p>
  *
- * @author fendo
- * @since 2023-03-02
+ * @author Claude
+ * @since 2023-03-11
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -132,12 +132,12 @@ public class CesRoomLayout extends Model<CesRoomLayout> {
     private Integer cancelDayNum;
 
     /**
-      1 入住当天
-      2 入住前 天数 可以取消
-      3 入住前 多少天 可以取消 要收取罚金
-      4不可以取消
-      5 可取消
-    */
+     * 1 入住当天
+2 入住前 天数 可以取消
+3 入住前 多少天 可以取消 要收取罚金
+4不可以取消
+5 可取消
+     */
     private Integer cancelRule;
 
     /**
@@ -157,6 +157,16 @@ public class CesRoomLayout extends Model<CesRoomLayout> {
      */
     private Boolean invalid;
 
+    /**
+     * 取消罚金
+     */
+    private BigDecimal cancelMoney;
+
+    /**
+     * 取消前时间节点
+     */
+    private String cancelBeforeTime;
+
 
     public static final String ID = "id";
 
@@ -208,6 +218,10 @@ public class CesRoomLayout extends Model<CesRoomLayout> {
 
     public static final String INVALID = "invalid";
 
+    public static final String CANCEL_MONEY = "cancel_money";
+
+    public static final String CANCEL_BEFORE_TIME = "cancel_before_time";
+
     @Override
     public Serializable pkVal() {
         return this.id;

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/service/CesRoomLayoutMemberPriceServiceImpl.java

@@ -39,7 +39,7 @@ public class CesRoomLayoutMemberPriceServiceImpl extends ServiceImpl<CesRoomLayo
 
     /**
      * 获取会员等级数据
-     * @param parentId
+     * @param parentId`
      * @return
      */
     public List<CesRoomLayoutMemberPrice> getListByParentId(String parentId){