From fc633fca328b68ca22182441340d384ca27dba55 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 16 一月 2025 18:14:37 +0800
Subject: [PATCH] 12.18

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RedPackegeSetController.java |    6 +++---
 1 files changed, 3 insertions(+), 3 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 db83906..547ad0b 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
@@ -33,7 +33,7 @@
     private RedPackegeSetService redPackegeSetService;
     //获取当前生效的红包设置
     @ResponseBody
-    @GetMapping("/get")
+    @PostMapping("/get")
     public R<BigDecimal> get(){
         LocalDateTime now = LocalDateTime.now();
         RedPackegeSet one = redPackegeSetService.lambdaQuery().le(RedPackegeSet::getStartTime, now).ge(RedPackegeSet::getEndTime, now).one();
@@ -66,11 +66,11 @@
     @PostMapping("/addRedPackegeSet")
     @Transactional(rollbackFor = Exception.class)
     public R<Void> addRedPackegeSet(@RequestBody RedPackegeSetDto redPackegeSets){
-        redPackegeSetService.remove(null);
         List<RedPackegeSet> redPackegeSetList = redPackegeSets.getRedPackegeSets();
         if (hasOverlap(redPackegeSetList)) {
-            R.fail("时间段存在重叠,请重新配置");
+            return R.fail("时间段存在重叠,请重新配置");
         }
+        redPackegeSetService.remove(null);
         redPackegeSetService.saveBatch(redPackegeSetList);
         return R.ok();
     }

--
Gitblit v1.7.1