From c137760697814b57c8ccb92cb1e0ed9d873f3045 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 16 一月 2025 19:44:46 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java |   80 ++++++++++++++++++++++------------------
 1 files changed, 44 insertions(+), 36 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
index 2d64dea..117cf9b 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -517,15 +517,17 @@
             appUser.setTotalPoint(appUser.getTotalPoint() - shopPoint);
 
             //构建积分流水明细
-            UserPoint userPoint = new UserPoint();
-            userPoint.setType(1);
-            userPoint.setHistoricalPoint(lavePoint);
-            userPoint.setVariablePoint(shopPoint);
-            userPoint.setBalance(appUser.getLavePoint());
-            userPoint.setCreateTime(LocalDateTime.now());
-            userPoint.setAppUserId(order.getAppUserId());
-            userPoint.setObjectId(order.getId());
-            userPointClient.saveUserPoint(userPoint);
+            if(shopPoint > 0){
+                UserPoint userPoint = new UserPoint();
+                userPoint.setType(1);
+                userPoint.setHistoricalPoint(lavePoint);
+                userPoint.setVariablePoint(shopPoint);
+                userPoint.setBalance(appUser.getLavePoint());
+                userPoint.setCreateTime(LocalDateTime.now());
+                userPoint.setAppUserId(order.getAppUserId());
+                userPoint.setObjectId(order.getId());
+                userPointClient.saveUserPoint(userPoint);
+            }
             appUserClient.editAppUserById(appUser);
     
             //降级检测
@@ -594,15 +596,17 @@
             appUser.setTransferablePoint(appUser.getTransferablePoint() + transferablePoint);
 
             //构建积分流水明细
-            UserPoint userPoint = new UserPoint();
-            userPoint.setType(11);
-            userPoint.setHistoricalPoint(lavePoint);
-            userPoint.setVariablePoint(order.getPoint());
-            userPoint.setBalance(appUser.getLavePoint());
-            userPoint.setCreateTime(LocalDateTime.now());
-            userPoint.setAppUserId(order.getAppUserId());
-            userPoint.setObjectId(order.getId());
-            userPointClient.saveUserPoint(userPoint);
+            if(order.getPoint() > 0){
+                UserPoint userPoint = new UserPoint();
+                userPoint.setType(11);
+                userPoint.setHistoricalPoint(lavePoint);
+                userPoint.setVariablePoint(order.getPoint());
+                userPoint.setBalance(appUser.getLavePoint());
+                userPoint.setCreateTime(LocalDateTime.now());
+                userPoint.setAppUserId(order.getAppUserId());
+                userPoint.setObjectId(order.getId());
+                userPointClient.saveUserPoint(userPoint);
+            }
             appUserClient.editAppUserById(appUser);
         }
 
@@ -650,15 +654,17 @@
         appUser.setTotalPoint(appUser.getTotalPoint() - shopPoint);
 
         //构建积分流水明细
-        UserPoint userPoint = new UserPoint();
-        userPoint.setType(1);
-        userPoint.setHistoricalPoint(lavePoint);
-        userPoint.setVariablePoint(shopPoint);
-        userPoint.setBalance(appUser.getLavePoint());
-        userPoint.setCreateTime(LocalDateTime.now());
-        userPoint.setAppUserId(order.getAppUserId());
-        userPoint.setObjectId(order.getId());
-        userPointClient.saveUserPoint(userPoint);
+        if(shopPoint > 0){
+            UserPoint userPoint = new UserPoint();
+            userPoint.setType(1);
+            userPoint.setHistoricalPoint(lavePoint);
+            userPoint.setVariablePoint(shopPoint);
+            userPoint.setBalance(appUser.getLavePoint());
+            userPoint.setCreateTime(LocalDateTime.now());
+            userPoint.setAppUserId(order.getAppUserId());
+            userPoint.setObjectId(order.getId());
+            userPointClient.saveUserPoint(userPoint);
+        }
         appUserClient.editAppUserById(appUser);
     
         //降级检测
@@ -710,15 +716,17 @@
         appUser.setTransferablePoint(appUser.getTransferablePoint() + transferablePoint);
 
         //构建积分流水明细
-        UserPoint userPoint = new UserPoint();
-        userPoint.setType(11);
-        userPoint.setHistoricalPoint(lavePoint);
-        userPoint.setVariablePoint(order.getPoint());
-        userPoint.setBalance(appUser.getLavePoint());
-        userPoint.setCreateTime(LocalDateTime.now());
-        userPoint.setAppUserId(order.getAppUserId());
-        userPoint.setObjectId(order.getId());
-        userPointClient.saveUserPoint(userPoint);
+        if(order.getPoint() > 0){
+            UserPoint userPoint = new UserPoint();
+            userPoint.setType(11);
+            userPoint.setHistoricalPoint(lavePoint);
+            userPoint.setVariablePoint(order.getPoint());
+            userPoint.setBalance(appUser.getLavePoint());
+            userPoint.setCreateTime(LocalDateTime.now());
+            userPoint.setAppUserId(order.getAppUserId());
+            userPoint.setObjectId(order.getId());
+            userPointClient.saveUserPoint(userPoint);
+        }
         return R.ok();
     }
 

--
Gitblit v1.7.1