diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/SettingAppController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/SettingAppController.java index e6bb187c..c26f202e 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/SettingAppController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/SettingAppController.java @@ -8,6 +8,7 @@ import com.ruoyi.cai.domain.WithdrawExchange; import com.ruoyi.cai.dto.app.vo.AgreementDTO; import com.ruoyi.cai.dto.app.vo.GiftVo; import com.ruoyi.cai.dto.app.vo.setting.SettingGoodsVo; +import com.ruoyi.cai.dto.app.vo.setting.WithdrawExchangeVo; import com.ruoyi.cai.enums.SystemConfigEnum; import com.ruoyi.cai.manager.SystemConfigManager; import com.ruoyi.cai.service.*; @@ -60,11 +61,14 @@ public class SettingAppController { @GetMapping("/withdraw") @Operation(summary = "提现配置") @Log(title = "提现配置", businessType = BusinessType.OTHER, isSaveDb = false) - public R> withdraw(){ + public R withdraw(){ + WithdrawExchangeVo vo = new WithdrawExchangeVo(); List list = withdrawExchangeService.list(Wrappers.lambdaQuery(WithdrawExchange.class) .eq(WithdrawExchange::getStatus,0) .orderByAsc(WithdrawExchange::getMoney)); - return R.ok(list); + vo.setWithdrawRuleRemark("平台50元起提现,最快2小时到账(每天不限次数),22点后提现次日中午10点到账"); + vo.setList(list); + return R.ok(vo); } @GetMapping("/report") diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/setting/WithdrawExchangeVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/setting/WithdrawExchangeVo.java new file mode 100644 index 00000000..3d19b173 --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/setting/WithdrawExchangeVo.java @@ -0,0 +1,15 @@ +package com.ruoyi.cai.dto.app.vo.setting; + +import com.ruoyi.cai.domain.WithdrawExchange; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.util.List; + +@Data +public class WithdrawExchangeVo { + @Schema(description = "提现规则说明") + private String withdrawRuleRemark; + @Schema(description = "提现设置") + private List list; +}