From e1940dda45fa066d994cc5cf0e34c7f97d9e7b2d Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 02 四月 2025 09:42:45 +0800
Subject: [PATCH] 修改bug
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index 8c6090c..9bb5161 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -311,7 +311,7 @@
orderPrivateCar.setPassengers(name);
orderPrivateCar.setPassengersPhone(phone);
if(instead == 0 || ToolUtil.isEmpty(orderPrivateCar.getPassengers())){
- orderPrivateCar.setPassengers(userInfo.getFirstName() + "." + userInfo.getLastName());
+ orderPrivateCar.setPassengers(ToolUtil.isNotEmpty(userInfo.getFirstName()) ? userInfo.getFirstName() + "." + userInfo.getLastName() : "");
orderPrivateCar.setPassengersPhone(userInfo.getPhone());
}
orderPrivateCar.setState(1);
@@ -729,7 +729,10 @@
BaseWarpper baseWarpper = new BaseWarpper();
double amount = 0;
CancleOrder query = cancleOrderService.query(orderPrivateCar.getCompanyId());
- if(null == query || null == orderPrivateCar.getDriverId() || orderPrivateCar.getState() == 11){
+ if(null == query){
+ return ResultUtil.error("请先添加取消规则");
+ }
+ if(null == orderPrivateCar.getDriverId() || orderPrivateCar.getState() == 11){
baseWarpper.setAmount(amount);
return ResultUtil.success(baseWarpper);
}
--
Gitblit v1.7.1