From 9e8c44a35db473c4598c09c3d0dc9ff276723e11 Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期四, 09 七月 2026 09:59:31 +0800
Subject: [PATCH] 积分兜底

---
 UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index d459209..23f59f8 100644
--- a/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -2131,8 +2131,10 @@
 			}
 
 			OpenCity openCity = openCityService.openCity1(orderPrivateCar.getStartLon().toString(), orderPrivateCar.getStartLat().toString());
-			SysIntegral query1 = sysIntegralMapper.query(openCity.getId());
-			userInfo.setIntegral(userInfo.getIntegral() + (orderMoney.intValue() * query1.getIntegral()));//积分
+			SysIntegral query1 = openCity == null ? null : sysIntegralMapper.query(openCity.getId());
+			Integer userIntegral = userInfo.getIntegral() == null ? 0 : userInfo.getIntegral();
+			Integer orderIntegral = query1 == null || query1.getIntegral() == null ? 0 : query1.getIntegral();
+			userInfo.setIntegral(userIntegral + (orderMoney.intValue() * orderIntegral));//积分
 
 			//添加交易明细
 			transactionDetailsService.saveData(uid, "快车订单", orderMoney, 2, 1, 1, 1, orderId);

--
Gitblit v1.7.1