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/UserCouponController.java |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java
index fe902b7..6dfc084 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java
@@ -243,15 +243,17 @@
             byId.setLavePoint(byId.getLavePoint() - point);
             appUserService.updateById(byId);
             
-            UserPoint userPoint = new UserPoint();
-            userPoint.setType(15);
-            userPoint.setHistoricalPoint(lavePoint);
-            userPoint.setVariablePoint(point);
-            userPoint.setBalance(byId.getLavePoint());
-            userPoint.setAppUserId(userid);
-            userPoint.setObjectId(Long.valueOf(data.getId()));
-            userPoint.setCreateTime(LocalDateTime.now());
-            userPointService.save(userPoint);
+            if(point > 0){
+                UserPoint userPoint = new UserPoint();
+                userPoint.setType(15);
+                userPoint.setHistoricalPoint(lavePoint);
+                userPoint.setVariablePoint(point);
+                userPoint.setBalance(byId.getLavePoint());
+                userPoint.setAppUserId(userid);
+                userPoint.setObjectId(Long.valueOf(data.getId()));
+                userPoint.setCreateTime(LocalDateTime.now());
+                userPointService.save(userPoint);
+            }
         }
         //增加优惠券记录,根据时间类型设置开始结束时间
         UserCoupon userCoupon = new UserCoupon();

--
Gitblit v1.7.1