From 20bf12dc209329b29ac96d01efabaa3a0ff30cb2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期日, 26 一月 2025 17:27:31 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RechargeSetController.java | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RechargeSetController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RechargeSetController.java
index 0da5cf3..ca5ead3 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RechargeSetController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RechargeSetController.java
@@ -1,17 +1,22 @@
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 com.ruoyi.other.vo.RechargeSetVO;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.math.BigDecimal;
import java.util.List;
/**
@@ -27,18 +32,33 @@
public class RechargeSetController {
@Resource
private RechargeSetService rechargeSetService;
+ @Resource
+ private BaseSettingService baseSettingService;
@GetMapping("/list")
@ApiOperation(value = "充值设置查询", tags = {"后台"})
- public R<List<RechargeSet>> list() {
- return R.ok(rechargeSetService.list());
+ public R<RechargeSetVO> list() {
+ BaseSetting baseSetting = baseSettingService.getById(7);
+ List<RechargeSet> list = rechargeSetService.list();
+ RechargeSetVO rechargeSetVO = new RechargeSetVO();
+ rechargeSetVO.setLimit(new BigDecimal(baseSetting.getContent()));
+ rechargeSetVO.setRechargeSetList(list);
+ return R.ok(rechargeSetVO);
}
+
+
+
@PostMapping("/set")
@ApiOperation(value = "充值设置", tags = {"后台"})
public R<List<RechargeSet>> detail(@RequestBody RechargeDto rechargeDto) {
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();
}
--
Gitblit v1.7.1