From 79d5e91444eca538d523d3bd014528abd939da33 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 14 八月 2025 18:54:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralController.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralController.java
index db89a16..722d689 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralController.java
@@ -513,17 +513,17 @@
Long userid = tokenService.getLoginUser().getUserid();
SysUser data = sysUserClient.getSysUser(userid).getData();
- if (data != null && data.getSiteId() != null) {
+ if (data != null ) {
if (data.getRoleType() == 1) {
// 平台
SysConfig data1 = sysConfigClient.getInfo(8L).getData();
sysConfigClient.update(data1);
TIntegralRule tIntegralRule = new TIntegralRule();
- tIntegralRule.setChargeCredit(data1.getConfigValue());
+ tIntegralRule.setChargeCredit("{\"num1\":"+data1.getConfigValue()+"}");
tIntegralRule.setContent(data1.getRemark());
tIntegralRule.setSiteId(0);
return R.ok(tIntegralRule);
- } else if (data.getRoleType() == 3){
+ } else if (data.getRoleType() == 2){
TIntegralRule res = integralRuleService.lambdaQuery().eq(TIntegralRule::getSiteId, data.getSiteId()).one();
return R.ok(res);
}else{
@@ -550,7 +550,9 @@
if (data.getRoleType() == 1) {
SysConfig data1 = sysConfigClient.getInfo(8L).getData();
- data1.setConfigValue(dto.getChargeCredit());
+ JSONObject jsonObject = JSONObject.parseObject(dto.getChargeCredit());
+ Integer num1 = jsonObject.getInteger("num1");
+ data1.setConfigValue(num1.toString());
data1.setRemark(dto.getContent());
sysConfigClient.update(data1);
} else {
--
Gitblit v1.7.1