Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-01-24 fd45fcbd496bbeaf9ee18edd8f2f858cf9cebaf3

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RechargeSetController.java

@@ -1,12 +1,15 @@
package com.ruoyi.other.controller;


import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.account.api.model.UserClickLog;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.other.api.domain.BaseSetting;
import com.ruoyi.other.api.domain.RechargeSet;
import com.ruoyi.other.dto.RechargeDto;
import com.ruoyi.other.service.BaseSettingService;
import com.ruoyi.other.service.RechargeSetService;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
@@ -27,6 +30,8 @@
public class RechargeSetController {
    @Resource
    private RechargeSetService rechargeSetService;
    @Resource
    private BaseSettingService baseSettingService;

    @GetMapping("/list")
    @ApiOperation(value = "充值设置查询", tags = {"后台"})
@@ -42,6 +47,11 @@
        List<RechargeSet> list = rechargeSetService.list();
        rechargeSetService.removeBatchByIds(list);
        rechargeSetService.saveBatch(rechargeDto.getRechargeDto());
        if (rechargeDto.getResetQuota() != null){
            baseSettingService.update(new LambdaUpdateWrapper<BaseSetting>()
                    .eq(BaseSetting::getId, 7)
                    .set(BaseSetting::getContent, rechargeDto.getResetQuota().toString()));
        }
        return R.ok();
    }