From 20fb7c22fd9d4a936a2e9f4b003da51a0c2a0217 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 25 四月 2025 18:11:19 +0800
Subject: [PATCH] 修改bug
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java | 133 +++++++++++++++++++++++++++----------------
1 files changed, 83 insertions(+), 50 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java
index 78dfdd8..1beddb3 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java
@@ -1,12 +1,10 @@
package com.stylefeng.guns.modular.system.controller.specialTrain;
-import cn.hutool.system.UserInfo;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.google.gson.Gson;
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.common.constant.factory.PageFactory;
import com.stylefeng.guns.core.shiro.ShiroKit;
@@ -34,7 +32,10 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStreamReader;
import java.math.BigDecimal;
import java.math.MathContext;
import java.math.RoundingMode;
@@ -77,9 +78,22 @@
@Resource
private ITUserService userService;
-
-
-
+
+ @Resource
+ private ITCarService carService;
+ private ResultUtil resultUtil;
+ @Autowired
+ private ITCompanyService companyService;
+ @Autowired
+ private ITDriverService driverService;
+ @Autowired
+ private IIncomeService incomeService;
+ @Autowired
+ private PushUtil pushUtil;
+ @Autowired
+ private ITSystemNoticeService systemNoticeService;
+ @Resource
+ private TSystemPriceMapper systemPriceMapper;
/**
* 跳转到专车订单首页
@@ -101,6 +115,7 @@
model.addAttribute("item",item);
return PREFIX + "tOrderPrivateCar_orderDetail.html";
}
+
/**
* 跳转到修改专车订单
*/
@@ -110,6 +125,7 @@
model.addAttribute("item",item);
return PREFIX + "toChangeMoney.html";
}
+
/**
* 跳转到出租车订单轨迹页面
*/
@@ -146,8 +162,6 @@
page.setRecords(tOrderPrivateCarService.getPrivateCarOrderList(page,beginTime,endTime,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),orderNum,orderSource,userName,userPhone,passengers,passengersPhone,serverCarModelId,driver,state,smsNumber));
return super.packForBT(page);
}
-
- private ResultUtil resultUtil;
/**
* 获取订单轨迹
@@ -188,17 +202,6 @@
return resultUtil;
}
- @Autowired
- private ITCompanyService companyService;
-
- @Autowired
- private ITDriverService driverService;
-
- @Autowired
- private IIncomeService incomeService;
-
-
-
/**
* 支付专车订单
*/
@@ -209,12 +212,12 @@
orderPrivateCar.setAbnormalMoney(orderPrivateCar.getOrderMoney());
orderPrivateCar.setOrderMoney(money);
orderPrivateCar.setPayMoney(money);
+ orderPrivateCar.setPayType(5);
orderPrivateCar.setState(7);
orderPrivateCar.setIsDispute(1);
orderPrivateCar.updateById();
return SUCCESS_TIP;
}
-
@RequestMapping(value = "/frozenOrder")
@ResponseBody
@@ -277,6 +280,43 @@
tOrderPrivateCarService.updateById(orderPrivateCar);
+ //修改行程数据
+ boolean updateTrip = fleetEngineUtil.updateTrip("COMPLETE", null, null, orderPrivateCar.getTripId(), null, null, null, null, orderPrivateCar.getId(), 1);
+ if(!updateTrip){
+ for (int i = 0; i < 5; i++) {
+ updateTrip = fleetEngineUtil.updateTrip("COMPLETE", null, null, orderPrivateCar.getTripId(), null, null, null, null, orderPrivateCar.getId(), 1);
+ if(updateTrip){
+ orderPrivateCar.setIsover(1);
+ tOrderPrivateCarService.updateById(orderPrivateCar);
+ break;
+ }
+ try {
+ Thread.sleep(3000L);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }else{
+ orderPrivateCar.setIsover(1);
+ tOrderPrivateCarService.updateById(orderPrivateCar);
+ }
+ //上报行程
+ boolean reportBillableEvent = fleetEngineUtil.reportBillableEvent(orderPrivateCar.getTripId());
+ if(!reportBillableEvent){
+ for (int i = 0; i < 5; i++) {
+ reportBillableEvent = fleetEngineUtil.reportBillableEvent(orderPrivateCar.getTripId());
+ if(reportBillableEvent){
+ break;
+ }
+ try {
+ Thread.sleep(3000L);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+
+
TUser userInfo = userService.selectById(orderPrivateCar.getUserId());
Integer language1 = userInfo.getLanguage();
@@ -297,18 +337,6 @@
}
}).start();
- TOrderPrivateCar finalOrderPrivateCar = orderPrivateCar;
- new Thread(()->{
- try {
- //上报google
- fleetEngineUtil.reportBillableEvent(finalOrderPrivateCar.getTripId());
- log.warn("上报时间：{}，tripid：{}，created_at：{}，completed_at：{}", System.currentTimeMillis(), finalOrderPrivateCar.getTripId(),
- finalOrderPrivateCar.getInsertTime().getTime(), finalOrderPrivateCar.getEndServiceTime().getTime());
- }catch (Exception e){
- e.printStackTrace();
- }
- }).start();
-
pushUtil.frozenOrder(orderPrivateCar.getDriverId(), 2);
}
@@ -317,12 +345,7 @@
tOrderPrivateCarService.updateById(orderPrivateCar);
return SUCCESS_TIP;
}
- @Autowired
- private PushUtil pushUtil;
- @Autowired
- private ITSystemNoticeService systemNoticeService;
- @Resource
- private TSystemPriceMapper systemPriceMapper;
+
public TOrderPrivateCar setMoney(TOrderPrivateCar orderPrivateCar, Double parkingFee, Double crossingFee) throws Exception {
System.err.println("计算金额:"+orderPrivateCar);
Map<String, Object> query1 = systemPriceMapper.query(orderPrivateCar.getCompanyId(), 1, orderPrivateCar.getServerCarModelId());
@@ -575,6 +598,7 @@
orderPrivateCar.setIsplatPay(2);
orderPrivateCar.setPayManner(1);
orderPrivateCar.setState(8);
+ orderPrivateCar.setPayType(5);
orderPrivateCar.setPayMoney(orderPrivateCar.getOrderMoney());
tOrderPrivateCarService.updateAllColumnById(orderPrivateCar);
return SUCCESS_TIP;
@@ -587,7 +611,9 @@
@ResponseBody
public Object cancel(@RequestParam Integer tOrderPrivateCarId) {
TOrderPrivateCar tOrderPrivateCar = tOrderPrivateCarService.selectById(tOrderPrivateCarId);
-
+ if(Arrays.asList(6, 7, 8, 9, 10).contains(tOrderPrivateCar.getState())){
+ return ERROR;
+ }
//修改之前司机状态 -- 空闲
if(null != tOrderPrivateCar.getDriverId()){
TDriver driver = tDriverService.selectById(tOrderPrivateCar.getDriverId());
@@ -611,19 +637,26 @@
orderCancelMapper.insert(orderCancel);
//修改行程信息
- try {
- boolean updateTrip = fleetEngineUtil.updateTrip("CANCELED", null, null, tOrderPrivateCar.getTripId(), null, null, null, null);
- if(!updateTrip){
- for (int i = 0; i < 5; i++) {
- updateTrip = fleetEngineUtil.updateTrip("CANCELED", null, null, tOrderPrivateCar.getTripId(), null, null, null, null);
- if(updateTrip){
- break;
- }
- Thread.sleep(5000L);
+ TCar car = carService.selectById(tOrderPrivateCar.getCarId());
+ //修改行程信息
+ boolean updateTrip = fleetEngineUtil.updateTrip("CANCELED", (null != car ? car.getVehicleId() : null), null, tOrderPrivateCar.getTripId(), null, null, null, null, tOrderPrivateCar.getId(), 1);
+ if(!updateTrip){
+ for (int i = 0; i < 5; i++) {
+ updateTrip = fleetEngineUtil.updateTrip("CANCELED", (null != car ? car.getVehicleId() : null), null, tOrderPrivateCar.getTripId(), null, null, null, null, tOrderPrivateCar.getId(), 1);
+ if(updateTrip){
+ tOrderPrivateCar.setIsover(1);
+ tOrderPrivateCarService.updateById(tOrderPrivateCar);
+ break;
+ }
+ try {
+ Thread.sleep(3000L);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
}
}
- } catch (Exception e) {
- throw new RuntimeException(e);
+ }else{
+ tOrderPrivateCar.setIsover(1);
+ tOrderPrivateCarService.updateById(tOrderPrivateCar);
}
--
Gitblit v1.7.1