From fd45fcbd496bbeaf9ee18edd8f2f858cf9cebaf3 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 24 一月 2025 16:47:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RechargeSetController.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 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 711ae18..b48222f 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,12 +1,15 @@
 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 io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
@@ -27,6 +30,8 @@
 public class RechargeSetController {
     @Resource
     private RechargeSetService rechargeSetService;
+    @Resource
+    private BaseSettingService baseSettingService;
 
     @GetMapping("/list")
     @ApiOperation(value = "充值设置查询", tags = {"后台"})
@@ -42,6 +47,11 @@
         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