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/system/warpper/OrderInfoWarpper.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java
index 5dd3856..d63c7ae 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java
@@ -146,6 +146,7 @@
     private String snatchOrderTime;
     @ApiModelProperty("超时取消时间")
     private Integer timeOutCancel;
+    private String tripId;
     private List<OrderPosition> orderPositionList;
 
     public static OrderInfoWarpper getOrderInfoWarpper(Map<String, Object> map){
@@ -219,6 +220,7 @@
             orderInfoWarpper.setTimeOutCancel(null != map.get("timeOutCancel") ? Integer.valueOf(map.get("timeOutCancel").toString()) : 0);
             orderInfoWarpper.setSnatchOrderTime(null != map.get("snatchOrderTime") ? map.get("snatchOrderTime").toString() : "");
             orderInfoWarpper.setPriceDifference(null != map.get("priceDifference") ? Double.valueOf(map.get("priceDifference").toString()) : 0);
+            orderInfoWarpper.setTripId(null != map.get("tripId") ? map.get("tripId").toString() : "");
         }
         if(orderInfoWarpper.getState()==7){
             orderInfoWarpper.setOrderMoney(orderInfoWarpper.getOrderMoney()-orderInfoWarpper.getDiscountMoney());

--
Gitblit v1.7.1