From bfa6af3b50fa16ed4f1d835f8f9fc9237c83e64c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期日, 27 四月 2025 17:26:32 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiShou into dev
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/PrizeController.java | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/PrizeController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/PrizeController.java
index 79bf5fc..eb960ca 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/PrizeController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/PrizeController.java
@@ -3,8 +3,12 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.admin.entity.MasterWorker;
import com.ruoyi.admin.entity.Prize;
+import com.ruoyi.admin.entity.RecoveryServe;
+import com.ruoyi.admin.service.MasterWorkerService;
import com.ruoyi.admin.service.PrizeService;
+import com.ruoyi.admin.service.RecoveryServeService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.annotation.RequiresPermissions;
import io.swagger.annotations.Api;
@@ -16,6 +20,7 @@
import javax.annotation.Resource;
import java.util.Arrays;
import java.util.List;
+import java.util.Objects;
import java.util.stream.Collectors;
/**
@@ -33,6 +38,10 @@
@Resource
private PrizeService prizeService;
+ @Resource
+ private RecoveryServeService recoveryServeService;
+ @Resource
+ private MasterWorkerService masterWorkerService;
/**
* 奖品分页列表
@@ -40,7 +49,7 @@
* @param pageNum 页码
* @param pageSize 每页显示条数
*/
- @RequiresPermissions("prize")
+ @RequiresPermissions("prize_list")
@ApiOperation(value = "奖品分页查询列表", tags = {"后台-系统设置-奖品管理"})
@GetMapping(value = "/page")
@ApiImplicitParams({
@@ -58,7 +67,7 @@
*
* @param id 奖品id
*/
- @RequiresPermissions("prize")
+ @RequiresPermissions("prize_detail")
@ApiOperation(value = "奖品详情", tags = {"后台-系统设置-奖品管理"})
@GetMapping(value = "/detail")
@ApiImplicitParams({
@@ -73,7 +82,7 @@
*
* @param prize 奖品信息
*/
- @RequiresPermissions("prize")
+ @RequiresPermissions("prize_save")
@ApiOperation(value = "新增奖品", tags = {"后台-系统设置-奖品管理"})
@PostMapping(value = "/save")
public R<String> save(@RequestBody Prize prize) {
@@ -85,7 +94,7 @@
*
* @param prize 奖品信息
*/
- @RequiresPermissions("prize")
+ @RequiresPermissions("prize_update")
@ApiOperation(value = "编辑奖品", tags = {"后台-系统设置-奖品管理"})
@PostMapping(value = "/update")
public R<String> update(@RequestBody Prize prize) {
@@ -97,7 +106,7 @@
*
* @param ids 奖品id拼接
*/
- @RequiresPermissions("prize")
+ @RequiresPermissions("prize_delete")
@ApiOperation(value = "批量删除奖品", tags = {"后台-系统设置-奖品管理"})
@GetMapping(value = "/batchDelete")
@ApiImplicitParams({
@@ -114,9 +123,17 @@
* 奖品列表 -- 远程调用
*/
@GetMapping(value = "/prizeList")
- public R<List<Prize>> prizeList() {
- return R.ok(prizeService.lambdaQuery().eq(Prize::getIsDelete, 0)
- .orderByDesc(Prize::getCreateTime).list());
+ public R<List<Prize>> prizeList(@RequestParam("serveId") Integer serveId) {
+ List<Prize> list = prizeService.lambdaQuery().eq(Prize::getIsDelete, 0)
+ .orderByDesc(Prize::getCreateTime).list();
+ // 查询服务
+ RecoveryServe recoveryServe = recoveryServeService.getById(serveId);
+ list.forEach(data -> {
+ if(Objects.nonNull(data.getPrizeType()) && data.getPrizeType() == 1){
+ data.setPrizeName("补贴金￥" + recoveryServe.getRecycleSubsidy());
+ }
+ });
+ return R.ok(list);
}
/**
--
Gitblit v1.7.1