钟点房计费规则bug修复 贺姜乐

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

@@ -40,10 +40,6 @@ public class CesHourRoomRule extends Model<CesHourRoomRule> {
      */
     private String hourRoomName;
 
-    /**
-     * 收费规则
-     */
-    private String rule;
 
     /**
      * 房型id
@@ -114,8 +110,6 @@ public class CesHourRoomRule extends Model<CesHourRoomRule> {
 
     public static final String HOUR_ROOM_NAME = "hour_room_name";
 
-    public static final String RULE = "rule";
-
     public static final String LAYOUT_IDS = "layout_ids";
 
     public static final String AFTER_OPEN_ROOM = "after_open_room";

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

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -135,7 +136,14 @@ public class CesHourRoomRuleServiceImpl extends ServiceImpl<CesHourRoomRuleMappe
         }
         cesHourRoomRule.setLayoutIds(dto.getLayoutIds());
         cesHourRoomRule.setUpdateAt(LocalDateTime.now());
-        cesHourRoomRuleMapper.updateById(cesHourRoomRule);
+        if (StringUtils.isBlank(cesHourRoomRule.getLayoutIds())){
+            cesHourRoomRuleMapper.update(cesHourRoomRule,new UpdateWrapper<CesHourRoomRule>().lambda()
+                    .set(CesHourRoomRule::getLayoutIds,null)
+                    .eq(CesHourRoomRule::getId,dto.getId()));
+        }else{
+            cesHourRoomRuleMapper.updateById(cesHourRoomRule);
+        }
+
         return Result.OK("关联房型成功！");
     }
 }