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/ShoppingCartServiceImpl.java |   88 ++++++++++++++++++++++++--------------------
 1 files changed, 48 insertions(+), 40 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
index 5fbb70b..7166cae 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
@@ -1129,16 +1129,18 @@
 						jsonObject.put("transferablePoint", earnPoint1);
 					}
 
-					UserPoint userPoint = new UserPoint();
-					userPoint.setType(1);
-					userPoint.setHistoricalPoint(lavePoint);
-					userPoint.setVariablePoint(earnPoint);
-					userPoint.setBalance(appUser.getLavePoint());
-					userPoint.setCreateTime(LocalDateTime.now());
-					userPoint.setAppUserId(appUser.getId());
-					userPoint.setObjectId(order.getId());
-					userPoint.setExtention(jsonObject.toJSONString());
-					userPointClient.saveUserPoint(userPoint);
+					if(earnPoint > 0){
+						UserPoint userPoint = new UserPoint();
+						userPoint.setType(1);
+						userPoint.setHistoricalPoint(lavePoint);
+						userPoint.setVariablePoint(earnPoint);
+						userPoint.setBalance(appUser.getLavePoint());
+						userPoint.setCreateTime(LocalDateTime.now());
+						userPoint.setAppUserId(appUser.getId());
+						userPoint.setObjectId(order.getId());
+						userPoint.setExtention(jsonObject.toJSONString());
+						userPointClient.saveUserPoint(userPoint);
+					}
 				}
 				appUser.setShopAmount(appUser.getShopAmount().add(paymentMoney).setScale(2, RoundingMode.HALF_EVEN));
 				appUser.setLastShopTime(LocalDateTime.now());
@@ -1313,16 +1315,18 @@
 			}
 
 			//构建积分流水记录
-			UserPoint userPoint = new UserPoint();
-			userPoint.setType(11);
-			userPoint.setHistoricalPoint(lavePoint);
-			userPoint.setVariablePoint(orderPoint);
-			userPoint.setBalance(appUser.getLavePoint());
-			userPoint.setCreateTime(LocalDateTime.now());
-			userPoint.setAppUserId(appUser.getId());
-			userPoint.setObjectId(order.getId());
-			userPoint.setExtention((tra >= 0 ? orderPoint : transferablePoint) + "");
-			userPointClient.saveUserPoint(userPoint);
+			if(orderPoint > 0){
+				UserPoint userPoint = new UserPoint();
+				userPoint.setType(11);
+				userPoint.setHistoricalPoint(lavePoint);
+				userPoint.setVariablePoint(orderPoint);
+				userPoint.setBalance(appUser.getLavePoint());
+				userPoint.setCreateTime(LocalDateTime.now());
+				userPoint.setAppUserId(appUser.getId());
+				userPoint.setObjectId(order.getId());
+				userPoint.setExtention((tra >= 0 ? orderPoint : transferablePoint) + "");
+				userPointClient.saveUserPoint(userPoint);
+			}
 
 			appUser.setLastShopTime(LocalDateTime.now());
 			appUserClient.editAppUserById(appUser);
@@ -1458,16 +1462,18 @@
 				jsonObject.put("transferablePoint", earnPoint1);
 			}
 
-			UserPoint userPoint = new UserPoint();
-			userPoint.setType(1);
-			userPoint.setHistoricalPoint(lavePoint);
-			userPoint.setVariablePoint(earnPoint);
-			userPoint.setBalance(appUser.getLavePoint());
-			userPoint.setCreateTime(LocalDateTime.now());
-			userPoint.setAppUserId(appUser.getId());
-			userPoint.setObjectId(order.getId());
-			userPoint.setExtention(jsonObject.toJSONString());
-			userPointClient.saveUserPoint(userPoint);
+			if(earnPoint > 0){
+				UserPoint userPoint = new UserPoint();
+				userPoint.setType(1);
+				userPoint.setHistoricalPoint(lavePoint);
+				userPoint.setVariablePoint(earnPoint);
+				userPoint.setBalance(appUser.getLavePoint());
+				userPoint.setCreateTime(LocalDateTime.now());
+				userPoint.setAppUserId(appUser.getId());
+				userPoint.setObjectId(order.getId());
+				userPoint.setExtention(jsonObject.toJSONString());
+				userPointClient.saveUserPoint(userPoint);
+			}
 		}
 		appUser.setShopAmount(appUser.getShopAmount().add(paymentMoney).setScale(2, RoundingMode.HALF_EVEN));
 		appUser.setLastShopTime(LocalDateTime.now());
@@ -1537,16 +1543,18 @@
 		}
 
 		//构建积分流水记录
-		UserPoint userPoint = new UserPoint();
-		userPoint.setType(11);
-		userPoint.setHistoricalPoint(lavePoint);
-		userPoint.setVariablePoint(orderPoint);
-		userPoint.setBalance(appUser.getLavePoint());
-		userPoint.setCreateTime(LocalDateTime.now());
-		userPoint.setAppUserId(appUser.getId());
-		userPoint.setObjectId(order.getId());
-		userPoint.setExtention((tra >= 0 ? orderPoint : transferablePoint) + "");
-		userPointClient.saveUserPoint(userPoint);
+		if(orderPoint > 0){
+			UserPoint userPoint = new UserPoint();
+			userPoint.setType(11);
+			userPoint.setHistoricalPoint(lavePoint);
+			userPoint.setVariablePoint(orderPoint);
+			userPoint.setBalance(appUser.getLavePoint());
+			userPoint.setCreateTime(LocalDateTime.now());
+			userPoint.setAppUserId(appUser.getId());
+			userPoint.setObjectId(order.getId());
+			userPoint.setExtention((tra >= 0 ? orderPoint : transferablePoint) + "");
+			userPointClient.saveUserPoint(userPoint);
+		}
 
 		//积分支付不反积分
 

--
Gitblit v1.7.1