From 960380f89c9371ba309d6c50b1ab1b677ea74575 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 26 八月 2025 20:51:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ChargeOrderServiceImpl.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ChargeOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ChargeOrderServiceImpl.java
index 0449fba..d4c673c 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ChargeOrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ChargeOrderServiceImpl.java
@@ -381,6 +381,12 @@
List<SysUser> data = sysUserClient.getSysUserAll().getData();
SysUser sysUser = data.stream().filter(e -> e.getSiteId().equals(site.getId())).findFirst().orElse(null);
if (sysUser != null) {
+ if (sysUser.getIntegral()==null){
+ sysUser.setIntegral(0);
+ }
+ if (sysUser.getIntegral()< point){
+ return R.fail("站点积分不足");
+ }
sysUser.setIntegral(sysUser.getIntegral()==null?0:sysUser.getIntegral()-point);
sysUserClient.updateSysUser(sysUser);
}
@@ -474,7 +480,7 @@
}
// 计算积分并向下取整（Floor）
int cashInt = cash.intValue();
- return cashInt*=num1;
+ return cashInt * num1;
} catch (NumberFormatException e) {
throw new RuntimeException("积分兑换比例配置值格式错误", e);
--
Gitblit v1.7.1