From a6cf27e733515a20fc14840f5c63b6c6139b1e33 Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期日, 26 一月 2025 11:16:27 +0800 Subject: [PATCH] 12.18 --- 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