From d45f3f7467e76477e8babbefd5844975bdff7af1 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 28 十一月 2024 15:45:58 +0800
Subject: [PATCH] 修改bug
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 11 +++++------
1 files changed, 5 insertions(+), 6 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 fea75bd..161c5ab 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
@@ -419,7 +419,7 @@
String randomCode = UUIDUtil.getRandomCode();
redisUtil.setStrValue("trip" + orderPrivateCar.getUserId(), randomCode);
OrderPrivateCar orderPrivateCar1 = new OrderPrivateCar();
- orderPrivateCar1.setId(orderPrivateCar.getCarId());
+ orderPrivateCar1.setId(orderPrivateCar.getId());
orderPrivateCar1.setTripId(randomCode);
this.updateById(orderPrivateCar1);
orderPrivateCar.setTripId(randomCode);
@@ -901,10 +901,11 @@
//修改行程信息
if(orderPrivateCar.getState() == 10 || orderPrivateCar.getState() == 12){
- boolean updateTrip = fleetEngineUtil.updateTrip("CANCELED", null, null, orderPrivateCar.getTripId(), null, null, null, null);
+ Car car = carService.selectById(orderPrivateCar.getCarId());
+ boolean updateTrip = fleetEngineUtil.updateTrip("CANCELED", car.getVehicleId(), null, orderPrivateCar.getTripId(), null, null, null, null);
if(!updateTrip){
for (int i = 0; i < 5; i++) {
- updateTrip = fleetEngineUtil.updateTrip("CANCELED", null, null, orderPrivateCar.getTripId(), null, null, null, null);
+ updateTrip = fleetEngineUtil.updateTrip("CANCELED", car.getVehicleId(), null, orderPrivateCar.getTripId(), null, null, null, null);
if(updateTrip){
break;
}
@@ -1185,7 +1186,7 @@
@Override
public synchronized String getOrderNum() throws Exception{
int size = this.selectCount(null);
- return "PRIVATE" + String.valueOf(1000000 + size + 1).substring(1);
+ return "RIDE" + String.valueOf(1000000 + size + 1).substring(1);
}
/**
@@ -1896,8 +1897,6 @@
? "You've paid for the ride order successfully, thank you for using I-GO"
: "Vous avez payé la commande de course avec succès, merci d’utiliser I-GO", orderPrivateCar.getUserId(), 1);
}
-
-
if(payType == 4){//现金支付
SysIntegral query1 = sysIntegralMapper.query(orderPrivateCar.getCompanyId());
userInfo.setIntegral(userInfo.getIntegral() + (orderMoney.intValue() * query1.getIntegral()));//积分
--
Gitblit v1.7.1