From 3cb59ae9ddc31e62988e5c7feb6647b44f1c7cf8 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 17 一月 2025 17:50:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserSignRecordController.java |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserSignRecordController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserSignRecordController.java
index 733f559..ed7cb65 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserSignRecordController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserSignRecordController.java
@@ -87,7 +87,6 @@
                 }
                 Integer lavePoint = appUser.getLavePoint();
                 appUser.setTotalPoint(appUser.getTotalPoint() + signPoint);
-                appUser.setTotalSignPoint(appUser.getTotalSignPoint() + signPoint);
                 appUser.setLavePoint(appUser.getLavePoint() + signPoint);
                 appUser.setAvailablePoint(appUser.getAvailablePoint() + signPoint1);
                 appUser.setTotalAvailablePoint(appUser.getTotalAvailablePoint() + signPoint1);
@@ -98,14 +97,16 @@
                 appUserService.updateById(appUser);
     
                 //添加积分变动记录
-                UserPoint userPoint = new UserPoint();
-                userPoint.setType(5);
-                userPoint.setHistoricalPoint(lavePoint);
-                userPoint.setVariablePoint(signPoint);
-                userPoint.setBalance(appUser.getLavePoint());
-                userPoint.setCreateTime(LocalDateTime.now());
-                userPoint.setAppUserId(appUser.getId());
-                userPointService.save(userPoint);
+                if(signPoint > 0){
+                    UserPoint userPoint = new UserPoint();
+                    userPoint.setType(5);
+                    userPoint.setHistoricalPoint(lavePoint);
+                    userPoint.setVariablePoint(signPoint);
+                    userPoint.setBalance(appUser.getLavePoint());
+                    userPoint.setCreateTime(LocalDateTime.now());
+                    userPoint.setAppUserId(appUser.getId());
+                    userPointService.save(userPoint);
+                }
                 //变更等级
                 appUserService.vipUpgrade(appUser.getId());
             }

--
Gitblit v1.7.1