From 0a92ccda431002d31f07a39821e48d670ffc3446 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 04 一月 2025 18:02:49 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/BaseSettingController.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 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 2e4356d..6cc0e7b 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;
+
/**
@@ -41,6 +56,11 @@
@ApiOperation(value = "获取基础配置", tags = {"管理后台-基础配置"})
public R<BaseSetting> getBaseSetting(@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);
}
@@ -77,7 +97,7 @@
- @PostMapping("/getRefundPassSetting")
+ @GetMapping("/getRefundPassSetting")
@ApiOperation(value = "获取售后设置", tags = {"管理后台-售后管理"})
public R<RefundPassSettingVo> getRefundPassSetting(){
BaseSetting one = baseSettingService.getOne(new LambdaQueryWrapper<BaseSetting>().eq(BaseSetting::getId, 5));
--
Gitblit v1.7.1