From 1c40baaf9ca0183945b9881d11ceed5aeebc8290 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 23 十月 2025 11:35:44 +0800
Subject: [PATCH] 修改bug
---
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java | 38 +++++++++++++++++++++++++++-----------
1 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java
index c3d8ce0..759821b 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java
@@ -556,6 +556,21 @@
orderCrossCity.setIsReassign(2);
orderCrossCityService.updateById(orderCrossCity);
+ if(ToolUtil.isNotEmpty(orderCrossCity.getTravelId())){
+ Company company = companyService.selectById(driver.getCompanyId());
+ //中台修改订单状态
+ ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest();
+ request.setOrderId(orderCrossCity.getTravelId());
+ request.setStatus(orderCrossCity.getState());
+ request.setDriverId(driver.getEmpId().toString());
+ if (2 == orderCrossCity.getPromotion()) {
+ Driver driver1 = driverService.selectById(orderCrossCity.getPromotionDriverId());
+ request.setPromoterId(driver1.getEmpId().toString());
+ }
+ request.setSupplierShopId(company.getEnterCode());
+ OrderUtil.modifyTravelItinerary(request);
+ }
+
//添加已收入明细
incomeService.saveData(1, orderCrossCity.getCompanyId(), 4, orderCrossCity.getId(), 3, reassign.getMoney());
}
@@ -569,15 +584,15 @@
// jgPushUtil.push(2, "有新的改派订单需要处理，请及时处理！", "订单改派", map, "DISPATCH" + dispatch.getId());
// }
}
- if (reassign.getPayType() == 4) {
-
- String[] split1 = ids.split(",");
- resultUtil = placeAnOrder1(new BigDecimal(aDouble), 4, 3, Integer.valueOf(split1[0]));
- for (String id : split1) {
- // TODO 司机云闪付 跨城改派调起云闪付
- paymentRecordService.saveData(1, uid, 2, Integer.valueOf(id), 3, 4, aDouble, "", 1);//添加预支付数据
- }
- }
+// if (reassign.getPayType() == 4) {
+//
+// String[] split1 = ids.split(",");
+// resultUtil = placeAnOrder1(new BigDecimal(aDouble), 4, 3, Integer.valueOf(split1[0]));
+// for (String id : split1) {
+// TODO 司机云闪付 跨城改派调起云闪付
+// paymentRecordService.saveData(1, uid, 2, Integer.valueOf(id), 3, 4, aDouble, "", 1);//添加预支付数据
+// }
+// }
}
return resultUtil;
}
@@ -793,8 +808,9 @@
for (int j = 0; j < 6; j++) {
Boolean push = false;
for (int i = 1; i <= querys.size(); i++) {
+ num++;
int finalI = i;
- PushOrder pushOrder = querys.stream().filter(s -> s.getType() == (finalI <= 3 ? finalI : 3)).findFirst().orElse(null);
+ PushOrder pushOrder = querys.stream().filter(s -> s.getType() == finalI).findFirst().orElse(null);
System.out.println("pushOrder:" + pushOrder);
//获取空闲司机
List<Driver> list = driverService.queryIdleDriver(2, orderTaxi.getStartLon(), orderTaxi.getStartLat(), pushOrder.getPushDistance(), null);//所有附近空闲司机
@@ -822,7 +838,7 @@
}
Thread.sleep(pushOrder.getPushTime() * 1000);//设置等待时间
Integer state = orderTaxi1.getState();
- if (state != 1 || state!= 11) {
+ if (state != 1 && state != 11) {
orderIds.remove(orderTaxi.getId());
push = true;
break;
--
Gitblit v1.7.1