From 257d66798aa538f8737980f13d94c547bf0b51ea Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 15 一月 2025 15:37:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RedPackegeSetController.java | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 109 insertions(+), 2 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 43cc2f6..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
@@ -1,9 +1,22 @@
package com.ruoyi.other.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.ruoyi.account.api.model.AppUser;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.other.api.domain.RedPackegeSet;
+import com.ruoyi.other.dto.RedPackegeSetDto;
+import com.ruoyi.other.service.RedPackegeSetService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
/**
* <p>
@@ -16,6 +29,100 @@
@RestController
@RequestMapping("/red-packege-set")
public class RedPackegeSetController {
+ @Resource
+ private RedPackegeSetService redPackegeSetService;
+ //获取当前生效的红包设置
+ @ResponseBody
+ @PostMapping("/get")
+ public R<BigDecimal> get(){
+ LocalDateTime now = LocalDateTime.now();
+ RedPackegeSet one = redPackegeSetService.lambdaQuery().le(RedPackegeSet::getStartTime, now).ge(RedPackegeSet::getEndTime, now).one();
+ if (one!=null){
+ return R.ok(one.getPackegeAmount());
+ }else {
+ return R.ok(BigDecimal.ZERO);
+
+ }
+ }
+
+
+ /**
+ * 获取红包配置
+ */
+ @ApiOperation(value = "获取红包配置", tags = {"管理后台-活动管理-签到红包"})
+ @GetMapping("/getRedPackegeSet")
+ public R<RedPackegeSetDto> getRedPackegeSet(){
+ List<RedPackegeSet> redPackegeSetList = redPackegeSetService.list();
+ RedPackegeSetDto redPackegeSetDto = new RedPackegeSetDto();
+ redPackegeSetDto.setRedPackegeSets(redPackegeSetList);
+ return R.ok(redPackegeSetDto);
+ }
+
+
+ /**
+ * 添加红包配置
+ */
+ @ApiOperation(value = "添加红包配置", tags = {"管理后台-活动管理-签到红包"})
+ @PostMapping("/addRedPackegeSet")
+ @Transactional(rollbackFor = Exception.class)
+ public R<Void> addRedPackegeSet(@RequestBody RedPackegeSetDto redPackegeSets){
+ List<RedPackegeSet> redPackegeSetList = redPackegeSets.getRedPackegeSets();
+ if (hasOverlap(redPackegeSetList)) {
+ return R.fail("时间段存在重叠，请重新配置");
+ }
+ redPackegeSetService.remove(null);
+ redPackegeSetService.saveBatch(redPackegeSetList);
+ return R.ok();
+ }
+
+ /**
+ * 删除红包配置
+ */
+ @ApiOperation(value = "删除红包配置", tags = {"管理后台-活动管理-签到红包"})
+ @GetMapping("/delRedPackegeSet")
+ public R<Void> delRedPackegeSet(){
+ redPackegeSetService.removeById(1);
+ return R.ok();
+ }
+
+ public static boolean hasOverlap(List<RedPackegeSet> redPackegeSetList) {
+ // 首先根据startTime对列表进行排序
+ Collections.sort(redPackegeSetList, Comparator.comparing(RedPackegeSet::getStartTime));
+
+ // 然后检查是否存在重叠
+ for (int i = 0; i < redPackegeSetList.size() - 1; i++) {
+ RedPackegeSet current = redPackegeSetList.get(i);
+ RedPackegeSet next = redPackegeSetList.get(i + 1);
+
+ // 如果当前时间段的结束时间晚于或等于下一个时间段的开始时间，则存在重叠
+ if (current.getEndTime().isAfter(next.getStartTime()) ||
+ current.getEndTime().isEqual(next.getStartTime())) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ public static void main(String[] args) {
+ // 示例数据
+ RedPackegeSet redPackegeSet = new RedPackegeSet();
+ redPackegeSet.setStartTime(LocalDateTime.of(2025, 1, 13, 0, 0));
+ redPackegeSet.setEndTime(LocalDateTime.of(2025, 1, 14, 0, 0));
+
+ RedPackegeSet redPackegeSet2 = new RedPackegeSet();
+ redPackegeSet2.setStartTime(LocalDateTime.of(2025, 1, 13, 0, 0));
+ redPackegeSet2.setEndTime(LocalDateTime.of(2025, 1, 14, 0, 0));
+ List<RedPackegeSet> redPackegeSetList = Arrays.asList(
+ redPackegeSet,redPackegeSet2
+ );
+
+ boolean overlapExists = hasOverlap(redPackegeSetList);
+ System.out.println("是否存在重叠: " + overlapExists);
+ }
+
+
+
}
--
Gitblit v1.7.1