From 5c6c47caba66269e8d11bdb5c1ccc04fb7e74d88 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 13 十一月 2024 10:46:50 +0800
Subject: [PATCH] 修改更新订单上tripid问题
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GoogleMap/FleetEngineUtil.java | 3 ++-
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 2 +-
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GoogleMap/FleetEngineUtil.java | 3 ++-
DriverIGOTravel/guns-admin/src/test/java/com/stylefeng/guns/GunsApplicationTest.java | 25 +++++++++++++++++++------
4 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GoogleMap/FleetEngineUtil.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GoogleMap/FleetEngineUtil.java
index f75f318..09c18ca 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GoogleMap/FleetEngineUtil.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GoogleMap/FleetEngineUtil.java
@@ -856,6 +856,7 @@
headers.put("Content-Type", "application/json");
get.addHeaders(headers);
+ logger.info("查询行程请求：{} {}", tripId, url);
HttpResponse response = get.execute();
logger.info("查询行程结果：{}", response.body());
JSONObject jsonObject = JSON.parseObject(response.body().replaceAll("@type", "type"));
@@ -863,7 +864,7 @@
if(null != error){
Integer code = error.getInteger("code");
if(code == 404){
- return "";
+ return null;
}
if(code == 401){
String status = error.getString("status");
diff --git a/DriverIGOTravel/guns-admin/src/test/java/com/stylefeng/guns/GunsApplicationTest.java b/DriverIGOTravel/guns-admin/src/test/java/com/stylefeng/guns/GunsApplicationTest.java
index 3cd90ed..026b642 100644
--- a/DriverIGOTravel/guns-admin/src/test/java/com/stylefeng/guns/GunsApplicationTest.java
+++ b/DriverIGOTravel/guns-admin/src/test/java/com/stylefeng/guns/GunsApplicationTest.java
@@ -1,8 +1,17 @@
//package com.stylefeng.guns;
//
+//import cn.hutool.http.HttpUtil;
+//import com.alibaba.fastjson.JSON;
+//import com.alibaba.fastjson.JSONObject;
+//import com.baomidou.mybatisplus.mapper.EntityWrapper;
+//import com.stylefeng.guns.core.util.ToolUtil;
//import com.stylefeng.guns.modular.smallLogistics.server.IOrderLogisticsService;
+//import com.stylefeng.guns.modular.specialTrain.model.OrderPrivateCar;
+//import com.stylefeng.guns.modular.specialTrain.server.IOrderPrivateCarService;
//import com.stylefeng.guns.modular.system.service.IDriverService;
//import com.stylefeng.guns.modular.system.service.IOrderEvaluateService;
+//import com.stylefeng.guns.modular.system.service.IOrderPositionService;
+//import com.stylefeng.guns.modular.system.util.GoogleMap.FleetEngineUtil;
//import com.stylefeng.guns.modular.system.warpper.ActivityWarpper;
//import org.junit.Test;
//import org.junit.runner.RunWith;
@@ -11,6 +20,7 @@
//import org.springframework.test.context.junit4.SpringRunner;
//
//import java.text.SimpleDateFormat;
+//import java.util.Arrays;
//import java.util.List;
//import java.util.Map;
//
@@ -31,13 +41,16 @@
// @Autowired
// private IDriverService driverService;
//
+// @Autowired
+// IOrderPrivateCarService orderPrivateCarService;
+//
+// @Autowired
+// private FleetEngineUtil fleetEngineUtil;
+//
// @Test
// public void test(){
-// try {
-// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-// List<ActivityWarpper> activityWarppers = driverService.queryMyActivity(2508, sdf.parse("2024-01-31"), 1);
-// }catch (Exception e){
-// e.printStackTrace();
-// }
+//
+//
+//
// }
//}
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index fea75bd..704b0a5 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -419,7 +419,7 @@
String randomCode = UUIDUtil.getRandomCode();
redisUtil.setStrValue("trip" + orderPrivateCar.getUserId(), randomCode);
OrderPrivateCar orderPrivateCar1 = new OrderPrivateCar();
- orderPrivateCar1.setId(orderPrivateCar.getCarId());
+ orderPrivateCar1.setId(orderPrivateCar.getId());
orderPrivateCar1.setTripId(randomCode);
this.updateById(orderPrivateCar1);
orderPrivateCar.setTripId(randomCode);
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GoogleMap/FleetEngineUtil.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GoogleMap/FleetEngineUtil.java
index a4186d1..d7fdfce 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GoogleMap/FleetEngineUtil.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GoogleMap/FleetEngineUtil.java
@@ -856,6 +856,7 @@
headers.put("Content-Type", "application/json");
get.addHeaders(headers);
+ logger.info("查询行程请求：{} {}", tripId, url);
HttpResponse response = get.execute();
logger.info("查询行程结果：{}", response.body());
JSONObject jsonObject = JSON.parseObject(response.body().replaceAll("@type", "type"));
@@ -863,7 +864,7 @@
if(null != error){
Integer code = error.getInteger("code");
if(code == 404){
- return "";
+ return null;
}
if(code == 401){
String status = error.getString("status");
--
Gitblit v1.7.1