From cc134fa83edea4865b48d7afc1acda5ad70e7465 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 13 一月 2025 11:20:05 +0800
Subject: [PATCH] 12.18

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RedPackegeSetController.java |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RedPackegeSetController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RedPackegeSetController.java
index 9a5e192..1cf964f 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RedPackegeSetController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RedPackegeSetController.java
@@ -65,6 +65,18 @@
     public R<Void> addRedPackegeSet(@RequestBody RedPackegeSetDto redPackegeSets){
         redPackegeSetService.remove(null);
         List<RedPackegeSet> redPackegeSetList = redPackegeSets.getRedPackegeSets();
+        for (int i = 0; i < redPackegeSetList.size(); i++) {
+            RedPackegeSet redPackegeSet = redPackegeSetList.get(i);
+            LocalDateTime startTime = redPackegeSet.getStartTime();
+            LocalDateTime endTime = redPackegeSet.getEndTime();
+            for (RedPackegeSet redPackegeSet1 : redPackegeSetList) {
+                LocalDateTime startTime1 = redPackegeSet1.getStartTime();
+                LocalDateTime endTime1 = redPackegeSet1.getEndTime();
+                if (!(endTime.isBefore(startTime1) || startTime.isAfter(endTime1))) {
+                    return R.fail("时间有重叠,请重新配置");
+                }
+            }
+        }
         redPackegeSetService.saveBatch(redPackegeSetList);
         return R.ok();
     }

--
Gitblit v1.7.1