From 4becc1e8cdb2fbe0dcb94493b75a59ec1817028c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 04 十一月 2023 16:05:04 +0800
Subject: [PATCH] 修改bug
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 35 +++++++++++++++++++++++++++++++++--
1 files changed, 33 insertions(+), 2 deletions(-)
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 2a08e14..ae75ffa 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
@@ -194,6 +194,9 @@
@Autowired
private TEmailService emailService;
+ @Autowired
+ private IPhoneService phoneService;
+
/**
@@ -811,8 +814,9 @@
params.add("orderId", orderId + "");
params.add("orderType", "1");
HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(params, headers);
- ResultUtil s = internalRestTemplate.postForObject("http://driver-server/base/netty/deleteTask", requestEntity, ResultUtil.class);
- if(s.getCode() != 200){
+ String s = internalRestTemplate.postForObject("http://driver-server/base/netty/deleteTask", requestEntity, String.class);
+ JSONObject jsonObject = JSON.parseObject(s, JSONObject.class);
+ if(jsonObject.getIntValue("code") != 200){
System.err.println("调用driver-server出错了");
}
}
@@ -1067,6 +1071,9 @@
end_time_chinese.text(sdf2.format(orderPrivateCar.getEndServiceTime()));
Element end_address_chinese = document.getElementById("end_address_chinese");
end_address_chinese.text(orderPrivateCar.getEndAddress());
+ Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId()));
+ Element server_tel_chinese = document.getElementById("server_tel_chinese");
+ server_tel_chinese.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
}
if(2 == language){
document.getElementById("chinese").remove();
@@ -1108,6 +1115,9 @@
end_time_english.text(sdf2.format(orderPrivateCar.getEndServiceTime()));
Element end_address_english = document.getElementById("end_address_english");
end_address_english.text(orderPrivateCar.getEndAddress());
+ Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId()));
+ Element server_tel_english = document.getElementById("server_tel_english");
+ server_tel_english.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
}
if(3 == language){
document.getElementById("chinese").remove();
@@ -1149,6 +1159,9 @@
end_time_french.text(sdf2.format(orderPrivateCar.getEndServiceTime()));
Element end_address_french = document.getElementById("end_address_french");
end_address_french.text(orderPrivateCar.getEndAddress());
+ Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId()));
+ Element server_tel_french = document.getElementById("server_tel_french");
+ server_tel_french.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
}
EmailUtil.send(userInfo.getEmail(), language == 1 ? "打车收据" : language == 2 ? "Ride receipt" : "Reçu de Ride", document.html());
@@ -1367,6 +1380,9 @@
end_time_chinese.text(sdf2.format(orderPrivateCar.getEndServiceTime()));
Element end_address_chinese = document.getElementById("end_address_chinese");
end_address_chinese.text(orderPrivateCar.getEndAddress());
+ Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId()));
+ Element server_tel_chinese = document.getElementById("server_tel_chinese");
+ server_tel_chinese.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
}
if(2 == language){
document.getElementById("chinese").remove();
@@ -1408,6 +1424,9 @@
end_time_english.text(sdf2.format(orderPrivateCar.getEndServiceTime()));
Element end_address_english = document.getElementById("end_address_english");
end_address_english.text(orderPrivateCar.getEndAddress());
+ Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId()));
+ Element server_tel_english = document.getElementById("server_tel_english");
+ server_tel_english.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
}
if(3 == language){
document.getElementById("chinese").remove();
@@ -1449,6 +1468,9 @@
end_time_french.text(sdf2.format(orderPrivateCar.getEndServiceTime()));
Element end_address_french = document.getElementById("end_address_french");
end_address_french.text(orderPrivateCar.getEndAddress());
+ Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId()));
+ Element server_tel_french = document.getElementById("server_tel_french");
+ server_tel_french.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
}
EmailUtil.send(userInfo.getEmail(), language == 1 ? "打车收据" : language == 2 ? "Ride receipt" : "Reçu de Ride", document.html());
@@ -1862,6 +1884,9 @@
end_time_chinese.text(sdf2.format(orderPrivateCar.getEndServiceTime()));
Element end_address_chinese = document.getElementById("end_address_chinese");
end_address_chinese.text(orderPrivateCar.getEndAddress());
+ Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId()));
+ Element server_tel_chinese = document.getElementById("server_tel_chinese");
+ server_tel_chinese.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
}
if(2 == language){
document.getElementById("chinese").remove();
@@ -1903,6 +1928,9 @@
end_time_english.text(sdf2.format(orderPrivateCar.getEndServiceTime()));
Element end_address_english = document.getElementById("end_address_english");
end_address_english.text(orderPrivateCar.getEndAddress());
+ Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId()));
+ Element server_tel_english = document.getElementById("server_tel_english");
+ server_tel_english.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
}
if(3 == language){
document.getElementById("chinese").remove();
@@ -1944,6 +1972,9 @@
end_time_french.text(sdf2.format(orderPrivateCar.getEndServiceTime()));
Element end_address_french = document.getElementById("end_address_french");
end_address_french.text(orderPrivateCar.getEndAddress());
+ Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId()));
+ Element server_tel_french = document.getElementById("server_tel_french");
+ server_tel_french.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
}
EmailUtil.send(userInfo.getEmail(), language == 1 ? "打车收据" : language == 2 ? "Ride receipt" : "Reçu de Ride", document.html());
--
Gitblit v1.7.1