From e93aad02d2dd2a6e624e81ea0adb3611a8fc43e5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 26 十二月 2024 17:16:19 +0800
Subject: [PATCH] 合并代码

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RechargeSetController.java |   30 ++++++++++++++++++++++++++++--
 1 files changed, 28 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 b892292..9812889 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,8 +1,18 @@
 package com.ruoyi.other.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+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.RechargeSet;
+import com.ruoyi.other.dto.RechargeDto;
+import com.ruoyi.other.service.RechargeSetService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * <p>
@@ -15,6 +25,22 @@
 @RestController
 @RequestMapping("/recharge-set")
 public class RechargeSetController {
+    @Resource
+    private RechargeSetService rechargeSetService;
+
+    @GetMapping("/list")
+    @ApiOperation(value = "充值设置查询", tags = {"后台"})
+    public R<List<RechargeSet>> list() {
+        return R.ok(rechargeSetService.list());
+    }
+    @PostMapping("/set")
+    @ApiOperation(value = "充值设置", tags = {"后台"})
+    public R<List<RechargeSet>> detail(@RequestBody RechargeDto rechargeDto) {
+        List<RechargeSet> list = rechargeSetService.list();
+        rechargeSetService.removeBatchByIds(list);
+        rechargeSetService.saveBatch(rechargeDto.getRechargeSets());
+        return R.ok();
+    }
 
 }
 

--
Gitblit v1.7.1