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 | 11 +++++++++--
1 files changed, 9 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 b48222f..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
@@ -11,10 +11,12 @@
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;
/**
@@ -35,8 +37,13 @@
@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);
}
--
Gitblit v1.7.1