From 45f8febad90601cdcad0b754e8a79da11d2d3561 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期五, 21 六月 2024 10:01:06 +0800
Subject: [PATCH] 修改google地图对接bug

---
 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
index 0e782eb..fbb3eb7 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -136,6 +136,7 @@
                 orderStatusWarpper.setOrderId(orderPrivateCar.getId());
                 orderStatusWarpper.setOrderType(1);
                 orderStatusWarpper.setState(orderPrivateCar.getState());
+                orderStatusWarpper.setTripId(orderPrivateCar.getTripId());
                 data.add(orderStatusWarpper);
             }
             List<OrderTaxi> list = orderTaxiService.queryOrder(uid, 1, 2, 3, 4, 5, 6, 7, 11, 12);
@@ -147,6 +148,7 @@
                 orderStatusWarpper.setOrderId(orderTaxi.getId());
                 orderStatusWarpper.setOrderType(2);
                 orderStatusWarpper.setState(orderTaxi.getState());
+//                orderStatusWarpper.setTripId(orderTaxi.getTripId());
                 data.add(orderStatusWarpper);
             }
             List<OrderCrossCity> orderCrossCities = orderCrossCityService.queryOrder(uid, 1, 2, 3, 4, 5, 6, 7, 11, 12);
@@ -158,6 +160,7 @@
                 orderStatusWarpper.setOrderId(orderCrossCity.getId());
                 orderStatusWarpper.setOrderType(3);
                 orderStatusWarpper.setState(orderCrossCity.getState());
+//                orderStatusWarpper.setTripId(orderPrivateCar.getTripId());
                 data.add(orderStatusWarpper);
             }
             return ResultUtil.success(data);

--
Gitblit v1.7.1