From c90a8ac772937f8f084356ea1f04c5dba1d9e5d5 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 24 一月 2025 11:15:33 +0800
Subject: [PATCH] 12.18

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/BaseSettingController.java |   30 ++++++++++++++++++++++++++++++
 1 files changed, 30 insertions(+), 0 deletions(-)

diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/BaseSettingController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/BaseSettingController.java
index c4a9776..2aee854 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/BaseSettingController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/BaseSettingController.java
@@ -4,9 +4,14 @@
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.account.api.feignClient.AppUserClient;
+import com.ruoyi.account.api.model.AppUser;
 import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.security.service.TokenService;
 import com.ruoyi.other.api.domain.BaseSetting;
+import com.ruoyi.other.api.domain.VipSetting;
 import com.ruoyi.other.service.BaseSettingService;
+import com.ruoyi.other.service.VipSettingService;
 import com.ruoyi.other.vo.RefundPassSettingVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -29,6 +34,16 @@
 
 	@Resource
 	private BaseSettingService baseSettingService;
+
+	@Resource
+	private VipSettingService vipSettingService;
+
+	@Resource
+	private TokenService tokenService;
+
+	@Resource
+	private AppUserClient appUserClient;
+
 	
 	
 	/**
@@ -44,6 +59,21 @@
 		return R.ok(baseSetting);
 	}
 
+
+	@ResponseBody
+	@GetMapping("/getBaseSetting1")
+	@ApiOperation(value = "获取基础配置", tags = {"小程序-基础配置"})
+	public R<BaseSetting> getBaseSetting1(@RequestParam("id") Integer id){
+		BaseSetting baseSetting = baseSettingService.getById(id);
+		Long userid = tokenService.getLoginUserApplet().getUserid();
+		AppUser appUser = appUserClient.getAppUserById(userid);
+		VipSetting vipSetting = vipSettingService.getById(appUser.getVipId());
+		baseSetting.setWithdraw(vipSetting.getVipWithdrawalRole());
+		baseSetting.setWithdrawalMinAmount(vipSetting.getVipWithdrawalMinAmount());
+		return R.ok(baseSetting);
+	}
+
+
 	/**
 	 * 保存设置
 	 */

--
Gitblit v1.7.1