From e93aad02d2dd2a6e624e81ea0adb3611a8fc43e5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 26 十二月 2024 17:16:19 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RedPackegeSetController.java | 25 ++++++++++---------------
1 files changed, 10 insertions(+), 15 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 5b5b1f6..9a5e192 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
@@ -4,6 +4,7 @@
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;
@@ -47,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);
}
@@ -58,19 +62,10 @@
@ApiOperation(value = "添加红包配置", tags = {"管理后台-活动管理-签到红包"})
@PostMapping("/addRedPackegeSet")
@Transactional(rollbackFor = Exception.class)
- public R<Void> addRedPackegeSet(@RequestBody List<RedPackegeSet> redPackegeSets){
- for (RedPackegeSet redPackegeSet : redPackegeSets) {
- RedPackegeSet one = redPackegeSetService.getOne(null);
- if (one==null){
- redPackegeSet.setId(1);
- redPackegeSetService.save(redPackegeSet);
- }else {
- if (one.getId()==null){
- return R.fail("参数错误");
- }
- redPackegeSetService.updateById(redPackegeSet);
- }
- }
+ public R<Void> addRedPackegeSet(@RequestBody RedPackegeSetDto redPackegeSets){
+ redPackegeSetService.remove(null);
+ List<RedPackegeSet> redPackegeSetList = redPackegeSets.getRedPackegeSets();
+ redPackegeSetService.saveBatch(redPackegeSetList);
return R.ok();
}
--
Gitblit v1.7.1