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 | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 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 96bf652..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
@@ -48,8 +48,11 @@
*/
@ApiOperation(value = "获取红包配置", tags = {"管理后台-活动管理-签到红包"})
@GetMapping("/getRedPackegeSet")
- public R<RedPackegeSet> getRedPackegeSet(){
- return R.ok(redPackegeSetService.getOne(null));
+ public R<RedPackegeSetDto> getRedPackegeSet(){
+ List<RedPackegeSet> redPackegeSetList = redPackegeSetService.list();
+ RedPackegeSetDto redPackegeSetDto = new RedPackegeSetDto();
+ redPackegeSetDto.setRedPackegeSets(redPackegeSetList);
+ return R.ok(redPackegeSetDto);
}
@@ -60,19 +63,21 @@
@PostMapping("/addRedPackegeSet")
@Transactional(rollbackFor = Exception.class)
public R<Void> addRedPackegeSet(@RequestBody RedPackegeSetDto redPackegeSets){
+ redPackegeSetService.remove(null);
List<RedPackegeSet> redPackegeSetList = redPackegeSets.getRedPackegeSets();
- for (RedPackegeSet redPackegeSet : redPackegeSetList) {
- RedPackegeSet one = redPackegeSetService.getOne(null);
- if (one==null){
- redPackegeSet.setId(1);
- redPackegeSetService.save(redPackegeSet);
- }else {
- if (one.getId()==null){
- return R.fail("参数错误");
+ 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.updateById(redPackegeSet);
}
}
+ redPackegeSetService.saveBatch(redPackegeSetList);
return R.ok();
}
--
Gitblit v1.7.1