From 8b09fbc19a96b57bf1d0e4d7c79b51a76aeca554 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 28 三月 2025 19:57:56 +0800
Subject: [PATCH] 修改bug
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java | 298 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 262 insertions(+), 36 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java
index 8cbe308..21db73c 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.stylefeng.guns.core.common.constant.state.Order;
import com.stylefeng.guns.core.util.DateUtil;
@@ -15,13 +16,11 @@
import com.stylefeng.guns.modular.system.dao.PhoneMapper;
import com.stylefeng.guns.modular.system.dao.RegionMapper;
import com.stylefeng.guns.modular.system.dao.SysReformistMapper;
-import com.stylefeng.guns.modular.system.model.BankCard;
-import com.stylefeng.guns.modular.system.model.Driver;
-import com.stylefeng.guns.modular.system.model.OrderPosition;
-import com.stylefeng.guns.modular.system.model.Region;
+import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.*;
import com.stylefeng.guns.modular.system.util.GoogleMap.DistancematrixVo;
+import com.stylefeng.guns.modular.system.util.GoogleMap.FleetEngineUtil;
import com.stylefeng.guns.modular.system.util.GoogleMap.GoogleMapUtil;
import com.stylefeng.guns.modular.system.util.GoogleMap.ReverseGeocodeVo;
import com.stylefeng.guns.modular.system.util.Tingg.TinggPayUtil;
@@ -34,6 +33,8 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -93,6 +94,27 @@
@Autowired
private IBankCardService bankCardService;
+
+ @Autowired
+ private ICancleOrderService cancleOrderService;
+
+ @Autowired
+ private ISettlementDetailService settlementDetailService;
+
+ @Autowired
+ private ISettlementRecordService settlementRecordService;
+
+ @Resource
+ private IBalanceUsageRecordService balanceUsageRecordService;
+
+ @Resource
+ private FleetEngineUtil fleetEngineUtil;
+
+ @Autowired
+ private IOrderPositionService orderPositionService;
+
+ @Autowired
+ private ICarService carService;
@@ -123,7 +145,7 @@
// List<Map<String, Object>> list2 = orderCrossCityService.queryOrderList(state, uid);
// datas.addAll(list2);
//小件物流
- List<Map<String, Object>> list3 = orderLogisticsService.queryOrderList(uid, language);
+ List<Map<String, Object>> list3 = orderLogisticsService.queryOrderList(state, uid, language);
datas.addAll(list3);
//分页
@@ -163,7 +185,7 @@
List<Map<String, Object>> list2 = orderCrossCityService.queryOrderList(language, state, uid);
datas.addAll(list2);
}else{//小件物流
- List<Map<String, Object>> list3 = orderLogisticsService.queryOrderList(uid, language);
+ List<Map<String, Object>> list3 = orderLogisticsService.queryOrderList(state, uid, language);
datas.addAll(list3);
}
@@ -199,12 +221,30 @@
// datas.addAll(list);
//专车
List<Map<String, Object>> list1 = orderPrivateCarService.queryMyAllOrder(state, uid, language);
+ for (Map<String, Object> map : list1) {
+ Integer id = Integer.valueOf(map.get("id").toString());
+ map.put("settleAccounts", 0);
+ SettlementDetail settlementDetail = settlementDetailService.selectOne(new EntityWrapper<SettlementDetail>().eq("orderId", id).eq("orderType", 1));
+ if(null != settlementDetail){
+ SettlementRecord settlementRecord = settlementRecordService.selectById(settlementDetail.getSettlementRecordId());
+ map.put("settleAccounts", null == settlementRecord || settlementRecord.getPaymentStatus() == 1 ? 0 : 1);
+ }
+ }
datas.addAll(list1);
//跨城
// List<Map<String, Object>> list2 = orderCrossCityService.queryMyAllOrder(state, uid);
// datas.addAll(list2);
//小件物流
List<Map<String, Object>> list3 = orderLogisticsService.queryMyAllOrder(state, uid, language);
+ for (Map<String, Object> map : list3) {
+ Integer id = Integer.valueOf(map.get("id").toString());
+ map.put("settleAccounts", 0);
+ SettlementDetail settlementDetail = settlementDetailService.selectOne(new EntityWrapper<SettlementDetail>().eq("orderId", id).eq("orderType", 4));
+ if(null != settlementDetail){
+ SettlementRecord settlementRecord = settlementRecordService.selectById(settlementDetail.getSettlementRecordId());
+ map.put("settleAccounts", null == settlementRecord || settlementRecord.getPaymentStatus() == 1 ? 0 : 1);
+ }
+ }
datas.addAll(list3);
List<OrderListWarpper> orderListWarpper = OrderListWarpper.getOrderListWarpper(datas);
@@ -234,12 +274,14 @@
switch (orderType){
case 1://专车
map = orderPrivateCarService.queryPushOrder(orderId, language);
- DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(Double.valueOf(map.get("startLat").toString()), Double.valueOf(map.get("startLon").toString()), Double.valueOf(lat), Double.valueOf(lon));
- map.put("startDistance", null != distancematrix ? distancematrix.getDistance() / 1000 : 0);
+ OrderPrivateCar orderPrivateCar = orderPrivateCarService.selectById(orderId);
+ String tripId = redisUtil.getValue("trip" + orderPrivateCar.getUserId());
+ DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(Double.valueOf(map.get("startLat").toString()), Double.valueOf(map.get("startLon").toString()), Double.valueOf(lat), Double.valueOf(lon), tripId);
+ map.put("startDistance", null != distancematrix ? new BigDecimal(distancematrix.getDistance()).divide(new BigDecimal(1000)).setScale(2, RoundingMode.HALF_EVEN).doubleValue() : 0);
//总距离
- distancematrix = GoogleMapUtil.getDistancematrix(Double.valueOf(map.get("startLat").toString()), Double.valueOf(map.get("startLon").toString()), Double.valueOf(map.get("endLat").toString()), Double.valueOf(map.get("endLon").toString()));
- map.put("totalDistance", null != distancematrix ? distancematrix.getDistance() / 1000 : 0);
+ distancematrix = GoogleMapUtil.getDistancematrix(Double.valueOf(map.get("startLat").toString()), Double.valueOf(map.get("startLon").toString()), Double.valueOf(map.get("endLat").toString()), Double.valueOf(map.get("endLon").toString()), tripId);
+ map.put("totalDistance", null != distancematrix ? new BigDecimal(distancematrix.getDistance()).divide(new BigDecimal(1000)).setScale(2, RoundingMode.HALF_EVEN).doubleValue() : 0);
Integer orderSource = Integer.valueOf(String.valueOf(map.get("orderSource")));
if(orderSource == 1 || orderSource == 2 || orderSource == 3){
@@ -343,12 +385,14 @@
break;
case 4://市内小件物流
map = orderLogisticsService.queryPushOrder(orderId, language);
- DistancematrixVo distancematrix1 = GoogleMapUtil.getDistancematrix(Double.valueOf(map.get("startLat").toString()), Double.valueOf(map.get("startLon").toString()), Double.valueOf(lat), Double.valueOf(lon));
- map.put("startDistance", null != distancematrix1 ? distancematrix1.getDistance() / 1000 : 0);
+ OrderLogistics orderLogistics = orderLogisticsService.selectById(orderId);
+ String tripId1 = redisUtil.getValue("trip" + orderLogistics.getUserId());
+ DistancematrixVo distancematrix1 = GoogleMapUtil.getDistancematrix(Double.valueOf(map.get("startLat").toString()), Double.valueOf(map.get("startLon").toString()), Double.valueOf(lat), Double.valueOf(lon), tripId1);
+ map.put("startDistance", null != distancematrix1 ? new BigDecimal(distancematrix1.getDistance()).divide(new BigDecimal(1000)).setScale(2, RoundingMode.HALF_EVEN).doubleValue() : 0);
//总距离
- distancematrix1 = GoogleMapUtil.getDistancematrix(Double.valueOf(map.get("startLat").toString()), Double.valueOf(map.get("startLon").toString()), Double.valueOf(map.get("endLat").toString()), Double.valueOf(map.get("endLon").toString()));
- map.put("totalDistance", null != distancematrix1 ? distancematrix1.getDistance() / 1000 : 0);
+ distancematrix1 = GoogleMapUtil.getDistancematrix(Double.valueOf(map.get("startLat").toString()), Double.valueOf(map.get("startLon").toString()), Double.valueOf(map.get("endLat").toString()), Double.valueOf(map.get("endLon").toString()), tripId1);
+ map.put("totalDistance", null != distancematrix1 ? new BigDecimal(distancematrix1.getDistance()).divide(new BigDecimal(1000)).setScale(2, RoundingMode.HALF_EVEN).doubleValue() : 0);
Integer orderSource3 = Integer.valueOf(String.valueOf(map.get("orderSource")));
if(orderSource3 == 1 || orderSource3 == 2 || orderSource3 == 3){
@@ -540,20 +584,15 @@
*/
@Override
public ResultUtil process(Integer orderId, Integer orderType, Integer state, Integer uid, Double lon, Double lat,String phone, String pickUpCode, Integer language) throws Exception {
- ReverseGeocodeVo reverseGeocode = GoogleMapUtil.getReverseGeocode(lat, lon);
- if(null == reverseGeocode){
- return ResultUtil.error(language == 1 ? "无效的经纬度" : language == 2 ? "Invalid longitude and latitude" : "Longitude et latitude non valides");
- }
- String address = reverseGeocode.getAddress();
switch (orderType){
case 1://专车
- return orderPrivateCarService.process(orderId, state, lon, lat, address, phone, language);
+ return orderPrivateCarService.process(orderId, state, lon, lat, phone, language, uid);
case 2://出租
// return orderTaxiService.process(orderId, state, lon, lat, address);
case 3://城际
// return orderCrossCityService.process(orderId, state, lon, lat, address);
case 4://同城小件
- return orderLogisticsService.process(orderId, state, lon, lat, address, pickUpCode, language);
+ return orderLogisticsService.process(orderId, state, lon, lat, pickUpCode, language, uid);
case 5://跨城小件
// return orderLogisticsService.process(orderId, state, lon, lat, address);
case 6:
@@ -575,16 +614,17 @@
* @throws Exception
*/
@Override
- public ResultUtil confirmFees(Integer language, Integer orderId, Integer orderType, Integer type, Double travelFee, Double parkingFee, Double crossingFee) throws Exception {
+ public ResultUtil confirmFees(Integer language, Integer orderId, Integer orderType, Integer type, Double travelFee,
+ Double parkingFee, Double crossingFee, Integer uid) throws Exception {
switch (orderType){
case 1://专车
- return orderPrivateCarService.confirmFees(language, orderId, type, parkingFee, crossingFee);
+ return orderPrivateCarService.confirmFees(language, orderId, type, parkingFee, crossingFee, uid);
case 2://出租
return orderTaxiService.confirmFees(orderId, type, travelFee, parkingFee, crossingFee);
case 3://城际（没有此流程）
break;
case 4://
- return orderLogisticsService.confirmFees(language, orderId, type, parkingFee, crossingFee);
+ return orderLogisticsService.confirmFees(language, orderId, type, parkingFee, crossingFee, uid);
case 5:
break;
case 6:
@@ -700,7 +740,7 @@
case 3://城际
return orderCrossCityService.calculateMileage(orderPosition);
case 4://
- break;
+ return orderLogisticsService.calculateMileage(orderPosition.getOrderId(), orderPosition.getLon(), orderPosition.getLat());
case 5:
break;
case 6:
@@ -720,10 +760,11 @@
*/
@Override
public Integer queryOrderNum(Integer driverId, Date start, Date end) throws Exception {
- //出租车
int i = orderPrivateCarService.selectCount(new EntityWrapper<OrderPrivateCar>().eq("driverId", driverId)
.between("insertTime", start, end).in("state", Arrays.asList(6, 7, 8, 9)));
- return i;
+ int i1 = orderLogisticsService.selectCount(new EntityWrapper<OrderLogistics>().eq("driverId", driverId)
+ .between("insertTime", start, end).in("state", Arrays.asList(6, 7, 8, 9)));
+ return i + i1;
}
@@ -1009,8 +1050,8 @@
new Thread(new Runnable() {
@Override
public void run() {
- pushUtil.pushOrderState(1, finalUserId, orderId, orderType, finalState);
- pushUtil.pushOrderState(2, finalDriverId, orderId, orderType, finalState);
+ pushUtil.pushOrderState(1, finalUserId, orderId, orderType, finalState, 0, "");
+ pushUtil.pushOrderState(2, finalDriverId, orderId, orderType, finalState, 0, "");
}
}).start();
return ResultUtil.success();
@@ -1056,7 +1097,7 @@
for(OrderPrivateCar order : orderList){
if(order.getSmsTime()==null ){
- if(order.getGetoffTime().getTime()+24*60*60*1000L<day.getTime()){
+ if(null != order.getGetoffTime() && order.getGetoffTime().getTime()+24*60*60*1000L<day.getTime()){
order.setSmsNumber(order.getSmsNumber()+1);
order.setSmsTime(day);
//发送短信
@@ -1136,8 +1177,8 @@
checkoutRequest.setRequestDescription("Travel completion payment");
checkoutRequest.setCallbackUrl(callbackPath + "/base/wxPayOrderTaxi");
checkoutRequest.setPendingRedirectUrl("");
- checkoutRequest.setSuccessRedirectUrl("http://182.160.16.251:81/payMoney/pages/success.html");
- checkoutRequest.setFailRedirectUrl("http://182.160.16.251:81/payMoney/pages/fail.html");
+ checkoutRequest.setSuccessRedirectUrl("https://igo.i-go.group/payMoney/pages/success.html");
+ checkoutRequest.setFailRedirectUrl("https://igo.i-go.group/payMoney/pages/fail.html");
ResultUtil resultUtil = TinggPayUtil.checkoutRequest(checkoutRequest);
if(resultUtil.getCode()==200){
paymentRecordService.saveData(1, uid, 2, orderId, orderType, 1, money, null, 1);//添加预支付数据
@@ -1162,8 +1203,8 @@
checkoutRequest.setRequestDescription("Travel completion payment");
checkoutRequest.setCallbackUrl(callbackPath + "/base/wxPayOrderTaxi");
checkoutRequest.setPendingRedirectUrl("");
- checkoutRequest.setSuccessRedirectUrl("http://182.160.16.251:81/payMoney/pages/success.html");
- checkoutRequest.setFailRedirectUrl("http://182.160.16.251:81/payMoney/pages/fail.html");
+ checkoutRequest.setSuccessRedirectUrl("https://igo.i-go.group/payMoney/pages/success.html");
+ checkoutRequest.setFailRedirectUrl("https://igo.i-go.group/payMoney/pages/fail.html");
ResultUtil resultUtil = TinggPayUtil.checkoutRequest(checkoutRequest);
if(resultUtil.getCode()==200){
@@ -1175,14 +1216,18 @@
}
if(payType == 3){//余额支付
driver.setBalance(driver.getBalance() - money);
- if(driver.getLaveBusinessMoney().compareTo(money) < 0){
- double b = money - driver.getLaveBusinessMoney();
+ Double laveBusinessMoney = driver.getLaveBusinessMoney();
+ if(laveBusinessMoney.compareTo(money) < 0){
+ double b = money - laveBusinessMoney;
driver.setLaveBusinessMoney(0D);
driver.setLaveActivityMoney(driver.getLaveActivityMoney() - b);
driverService.updateById(driver);
+ balanceUsageRecordService.saveBalanceUsageRecord(driver.getId(), 1, b, orderType == 1 ? 1 : 2);
+ balanceUsageRecordService.saveBalanceUsageRecord(driver.getId(), 2, laveBusinessMoney, orderType == 1 ? 1 : 2);
}else{
driver.setLaveBusinessMoney(driver.getLaveBusinessMoney() - money);
driverService.updateById(driver);
+ balanceUsageRecordService.saveBalanceUsageRecord(driver.getId(), 2, money, orderType == 1 ? 1 : 2);
}
if(orderType == 1){//专车
@@ -1200,6 +1245,187 @@
}
return ResultUtil.success();
}
+
+
+ @Override
+ public void getDriverNowPosition() {
+ for (OrderPrivateCar orderPrivateCar : orderPrivateCarService.selectList(new EntityWrapper<OrderPrivateCar>().eq("state", 5))) {
+ String trackId = orderPrivateCar.getTrackId();
+ if(ToolUtil.isNotEmpty(trackId)){
+ String trip = fleetEngineUtil.getTrip(trackId);
+ JSONObject lastLocation = JSON.parseObject(trip).getJSONObject("lastLocation");
+ JSONObject location = lastLocation.getJSONObject("location");
+ Double latitude = location.getDouble("latitude");
+ Double longitude = location.getDouble("longitude");
+ OrderPosition orderPosition = new OrderPosition();
+ orderPosition.setOrderId(orderPrivateCar.getId());
+ orderPosition.setOrderType(1);
+ orderPosition.setDriverId(orderPrivateCar.getDriverId());
+ orderPosition.setLat(latitude.toString());
+ orderPosition.setLon(longitude.toString());
+ orderPosition.setInsertTime(new Date());
+ try {
+ orderPositionService.saveData(orderPosition);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+
+ List<OrderLogistics> orderLogisticsList = orderLogisticsService.selectList(new EntityWrapper<OrderLogistics>().eq("state", 5));
+ for (OrderLogistics orderLogistics : orderLogisticsList) {
+ String trackId = orderLogistics.getTrackId();
+ if(ToolUtil.isNotEmpty(trackId)){
+ String trip = fleetEngineUtil.getTrip(trackId);
+ JSONObject lastLocation = JSON.parseObject(trip).getJSONObject("lastLocation");
+ JSONObject location = lastLocation.getJSONObject("location");
+ Double latitude = location.getDouble("latitude");
+ Double longitude = location.getDouble("longitude");
+ OrderPosition orderPosition = new OrderPosition();
+ orderPosition.setOrderId(orderLogistics.getId());
+ orderPosition.setOrderType(1);
+ orderPosition.setDriverId(orderLogistics.getDriverId());
+ orderPosition.setLat(latitude.toString());
+ orderPosition.setLon(longitude.toString());
+ orderPosition.setInsertTime(new Date());
+ try {
+ orderPositionService.saveData(orderPosition);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+ }
+
+
+ /**
+ * 结束google订单状态
+ */
+ @Override
+ public void overGoogleOrder() {
+ List<OrderPrivateCar> privateCars = orderPrivateCarService.selectList(new EntityWrapper<OrderPrivateCar>().isNotNull("tripId")
+ .eq("isover", 0).in("state", Arrays.asList(7, 8, 9, 10)).eq("isDelete", 1));
+ for (OrderPrivateCar privateCar : privateCars) {
+ Integer state = privateCar.getState();
+ String tripId = privateCar.getTripId();
+ String trip = fleetEngineUtil.getTrip(tripId);
+ if("" == trip){
+ privateCar.setIsover(1);
+ orderPrivateCarService.updateById(privateCar);
+ continue;
+ }
+ if(ToolUtil.isNotEmpty(trip)){
+ JSONObject jsonObject = JSON.parseObject(trip);
+ String tripStatus = jsonObject.getString("tripStatus");
+ Car car = carService.selectById(privateCar.getCarId());
+ if(Arrays.asList(10, 12).contains(state) && !"CANCELED".equals(tripStatus)){
+ //修改行程信息
+ boolean updateTrip = fleetEngineUtil.updateTrip("CANCELED", (null != car ? car.getVehicleId() : null), null, tripId, null, null, null, null);
+ if(!updateTrip){
+ for (int i = 0; i < 5; i++) {
+ updateTrip = fleetEngineUtil.updateTrip("CANCELED", (null != car ? car.getVehicleId() : null), null, tripId, null, null, null, null);
+ if(updateTrip){
+ privateCar.setIsover(1);
+ orderPrivateCarService.updateById(privateCar);
+ break;
+ }
+ try {
+ Thread.sleep(3000L);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }else{
+ privateCar.setIsover(1);
+ orderPrivateCarService.updateById(privateCar);
+ }
+ }
+ if(Arrays.asList(6, 7, 8, 9).contains(state) && !"COMPLETE".equals(tripStatus)){
+ //修改行程信息
+ boolean updateTrip = fleetEngineUtil.updateTrip("COMPLETE", (null != car ? car.getVehicleId() : null), null, tripId, null, null, null, null);
+ if(!updateTrip){
+ for (int i = 0; i < 5; i++) {
+ updateTrip = fleetEngineUtil.updateTrip("COMPLETE", (null != car ? car.getVehicleId() : null), null, tripId, null, null, null, null);
+ if(updateTrip){
+ privateCar.setIsover(1);
+ orderPrivateCarService.updateById(privateCar);
+ break;
+ }
+ try {
+ Thread.sleep(3000L);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }else{
+ privateCar.setIsover(1);
+ orderPrivateCarService.updateById(privateCar);
+ }
+ }
+ }
+ }
+ List<OrderLogistics> orderLogisticsList = orderLogisticsService.selectList(new EntityWrapper<OrderLogistics>().isNotNull("tripId")
+ .eq("isover", 0).in("state", Arrays.asList(7, 8, 9, 10)).eq("isDelete", 1));
+ for (OrderLogistics orderLogistics : orderLogisticsList) {
+ Integer state = orderLogistics.getState();
+ String tripId = orderLogistics.getTripId();
+ String trip = fleetEngineUtil.getTrip(tripId);
+ if("" == trip){
+ orderLogistics.setIsover(1);
+ orderLogisticsService.updateById(orderLogistics);
+ continue;
+ }
+ if(ToolUtil.isNotEmpty(trip)){
+ JSONObject jsonObject = JSON.parseObject(trip);
+ String tripStatus = jsonObject.getString("tripStatus");
+ Car car = carService.selectById(orderLogistics.getCarId());
+ if(Arrays.asList(10, 12).contains(state) && !"CANCELED".equals(tripStatus)){
+ //修改行程信息
+ boolean updateTrip = fleetEngineUtil.updateTrip("CANCELED", (null != car ? car.getVehicleId() : null), null, tripId, null, null, null, null);
+ if(!updateTrip){
+ for (int i = 0; i < 5; i++) {
+ updateTrip = fleetEngineUtil.updateTrip("CANCELED", (null != car ? car.getVehicleId() : null), null, tripId, null, null, null, null);
+ if(updateTrip){
+ orderLogistics.setIsover(1);
+ orderLogisticsService.updateById(orderLogistics);
+ break;
+ }
+ try {
+ Thread.sleep(3000L);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }else{
+ orderLogistics.setIsover(1);
+ orderLogisticsService.updateById(orderLogistics);
+ }
+ }
+ if(Arrays.asList(6, 7, 8, 9).contains(state) && !"COMPLETE".equals(tripStatus)){
+ //修改行程信息
+ boolean updateTrip = fleetEngineUtil.updateTrip("COMPLETE", (null != car ? car.getVehicleId() : null), null, tripId, null, null, null, null);
+ if(!updateTrip){
+ for (int i = 0; i < 5; i++) {
+ updateTrip = fleetEngineUtil.updateTrip("COMPLETE", (null != car ? car.getVehicleId() : null), null, tripId, null, null, null, null);
+ if(updateTrip){
+ orderLogistics.setIsover(1);
+ orderLogisticsService.updateById(orderLogistics);
+ break;
+ }
+ try {
+ Thread.sleep(3000L);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }else{
+ orderLogistics.setIsover(1);
+ orderLogisticsService.updateById(orderLogistics);
+ }
+ }
+ }
+ }
+ }
}
--
Gitblit v1.7.1