新增

1、预约配置增加开放时间段
修改
1、供应商导入模板修改
BUGFIX
1、修复外出产生退费后删除对应日常费用再取消的场景报错问题

sql/mysql/appointment_config.sql

@@ -10,6 +10,7 @@ CREATE TABLE `appointment_config`  (
   `person_daily_limit` int(11) NULL DEFAULT NULL COMMENT '单人名额-每日限制（如10）',
   `begin_book_days` int(11) NULL DEFAULT 0 COMMENT '开始预约日（0表示当天）',
   `advance_days` int(11) NULL DEFAULT 0 COMMENT '提前预约天数（0表示当天）',
+  `open_time_slot` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '开放时间段（逗号分隔，如"08:00-12:00,14:00-18:00"，为空表示不限制）',
   `create_time` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
   `update_time` datetime NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
   `creator` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '创建人',

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/biz/vo/ElderlyFixedExpenseAppendReqVO.java

@@ -41,11 +41,9 @@ public class ElderlyFixedExpenseAppendReqVO {
 
     @Schema(description = "单价(原价)", requiredMode = Schema.RequiredMode.REQUIRED, example = "1800")
     @NotNull(message = "单价不能为空")
-    @DecimalMin(value = "0", inclusive = false, message = "单价必须大于0")
     private BigDecimal amount;
 
     @Schema(description = "实际单价，不传默认等于单价", example = "1700")
-    @DecimalMin(value = "0", inclusive = false, message = "实际单价必须大于0")
     private BigDecimal actualAmount;
 
     @Schema(description = "数量，不传默认 1", example = "1")

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/biz/AppointmentConfigDO.java

@@ -70,4 +70,9 @@ public class AppointmentConfigDO extends BaseNoDeleteDO {
      */
     private Long tenantId;
 
+    /**
+     * 开放时间段（逗号分隔，如"08:00-12:00,14:00-18:00"，为空表示不限制）
+     */
+    private String openTimeSlot;
+
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/biz/DailyExpensesServiceImpl.java

@@ -173,6 +173,9 @@ public class DailyExpensesServiceImpl implements DailyExpensesService {
             success = ELDERLY_DAILY_EXPENSES_DELETE_SUCCESS, extra = "{{#dailyExpenses.elderId}}")
     public void deleteDailyExpenses(Long id) {
         DailyExpensesDO dailyExpensesDO = dailyExpensesMapper.selectById(id);
+        if(dailyExpensesDO == null){
+            return;
+        }
         // 该日常费用是否已完成缴费
         boolean isPay = false;
         //生成过账单的日常费用要删除对应账单下的关联费项