Merge remote-tracking branch 'origin/dev' into dev

无关风月

2025-04-21 1668fe1b912d07191c9fd7f20808d7d2162bc8e8

 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/PrizeController.java

@@ -5,8 +5,10 @@
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;
@@ -18,6 +20,7 @@
import javax.annotation.Resource;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;

/**
@@ -35,6 +38,8 @@

    @Resource
    private PrizeService prizeService;
    @Resource
    private RecoveryServeService recoveryServeService;
    @Resource
    private MasterWorkerService masterWorkerService;

@@ -118,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);
    }

    /**