From 73919e63d610e0046f8066106706f063f89df17c Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 03 十一月 2025 16:49:12 +0800
Subject: [PATCH] 修改bug
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/controller/rideCommentController.java | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/controller/rideCommentController.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/controller/rideCommentController.java
index 5f1ac22..1405d7d 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/controller/rideCommentController.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/controller/rideCommentController.java
@@ -965,6 +965,9 @@
request1.setCustomerId(userInfo.getOnconUUID());
request1.setOrderNo("SF" + orderRide1.getId());
ListPage<List<TravelItinerary>> travelItineraryList = OrderUtil.getTravelItineraryList(request1);
+ if(travelItineraryList.getList().isEmpty()){
+ return;
+ }
TravelItinerary travelItinerary = travelItineraryList.getList().get(0);
if(travelItinerary.getStatus() != 7 || Arrays.asList(3, 11).contains(travelItinerary.getOrderStatus())){
GetPaymentInfoDataRequest getPaymentInfoDataRequest1 = new GetPaymentInfoDataRequest();
@@ -1061,14 +1064,28 @@
//todo 推送
/*司机接单给用户发送消息*/
OrderRide orderRide=orderRideService.selectOne(new EntityWrapper<OrderRide>().eq("travelId",orderId));
- if(orderRide!=null) {
- pushUtil.pushOrderState(1, orderRide.getUserId(), orderRide.getId(), 8, 6, null);
- }
+// if(orderRide!=null) {
+// pushUtil.pushOrderState(1, orderRide.getUserId(), orderRide.getId(), 8, 6, null);
+// }
//取消乘客订单
if(orderRide!=null && orderRide.getState()!=6){
- orderRide.setTuiMoney(orderRide.getMoney());
- orderRideService.updateById(orderRide);
- userCancelTuik(orderRide);
+// orderRide.setTuiMoney(orderRide.getMoney());
+// orderRideService.updateById(orderRide);
+// userCancelTuik(orderRide);
+ orderRide.setState(2);
+ orderRide.setTravelId(null);
+ orderRide.setDriverId(null);
+ orderRideService.updateAllColumnById(orderRide);
+ if(null != orderRide.getZttravelId()){
+ //中台修改订单状态
+ ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest();
+ request.setOrderId(orderRide.getZttravelId());
+ request.setStatus(getState(orderRide.getState()));
+ if (null != orderRide.getDriverId()) {
+ request.setDriverId(driverRide.getEmpId().toString());
+ }
+ OrderUtil.modifyTravelItinerary(request);
+ }
}
return ResultUtil.success("");
--
Gitblit v1.7.1