From 77bca6b387f9349d072b8737e82b42fd7f723be0 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期五, 02 八月 2024 18:07:39 +0800
Subject: [PATCH] 修改2.0 bug
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java | 351 ++++++++++++++++++++++-
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/IOrderLogisticsService.java | 2
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/IOrderPrivateCarService.java | 2
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java | 66 +++-
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 26 +
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TIntegralOrderController.java | 18
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 7
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java | 7
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 9
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CarModelMapper.xml | 2
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 351 ++++++++++++++++++++++-
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOrderService.java | 3
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java | 4
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java | 8
14 files changed, 784 insertions(+), 72 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
index 8014d52..ace0daa 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
@@ -25,6 +25,7 @@
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -1760,6 +1761,9 @@
if(null == uid){
return ResultUtil.tokenErr();
}
+ if(!StringUtils.hasLength(vehicleId)){
+ return ResultUtil.paranErr();
+ }
Map<String, Object> s = fleetEngineUtil.fleetEngineAuth(2, vehicleId);
return ResultUtil.success(s);
}catch (Exception e){
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
index 1c5428f..5a7af6a 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -448,9 +448,14 @@
@ApiImplicitParam(value = "过路费", name = "crossingFee", required = false, dataType = "double"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil confirmFees(Integer language, Integer orderId, Integer orderType, Integer type, Double travelFee, Double parkingFee, Double crossingFee){
+ public ResultUtil confirmFees(Integer language, Integer orderId, Integer orderType, Integer type,
+ Double travelFee, Double parkingFee, Double crossingFee, HttpServletRequest request){
try{
- return orderService.confirmFees(language, orderId, orderType, type, travelFee, parkingFee, crossingFee);
+ Integer uid = driverService.getUserIdFormRedis(request);
+ if(null == uid){
+ return ResultUtil.tokenErr();
+ }
+ return orderService.confirmFees(language, orderId, orderType, type, travelFee, parkingFee, crossingFee, uid);
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/IOrderLogisticsService.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/IOrderLogisticsService.java
index e91fccf..bc7cd0a 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/IOrderLogisticsService.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/IOrderLogisticsService.java
@@ -156,7 +156,7 @@
* @return
* @throws Exception
*/
- ResultUtil confirmFees(Integer language, Integer orderId, Integer type, Double parkingFee, Double crossingFee) throws Exception;
+ ResultUtil confirmFees(Integer language, Integer orderId, Integer type, Double parkingFee, Double crossingFee, Integer uid) throws Exception;
/**
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
index 50aaf74..37a3de8 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
@@ -750,6 +750,7 @@
OrderLogistics orderLogistics = this.selectById(orderId);
if(orderLogistics.getState() == 6){//服务中的时候获取实时费用数据
this.setMoney(orderLogistics, 0D, 0D);
+ orderLogistics.setOrderMoney(orderLogistics.getOrderMoney() + orderLogistics.getPriceDifference());
}
Map<String, Object> map = new HashMap<>();
@@ -996,10 +997,13 @@
* @throws Exception
*/
@Override
- public ResultUtil confirmFees(Integer language, Integer orderId, Integer type, Double parkingFee, Double crossingFee) throws Exception {
+ public ResultUtil confirmFees(Integer language, Integer orderId, Integer type, Double parkingFee, Double crossingFee, Integer uid) throws Exception {
OrderLogistics orderLogistics = this.selectById(orderId);
+ if(!uid.equals(orderLogistics.getDriverId())){
+ return ResultUtil.error(language == 1 ? "操作失败，请刷新订单" : language == 2 ? "Operation failed, please refresh the order" : "L’opération a échoué, veuillez actualiser la commande");
+ }
if(6 != orderLogistics.getState()){
- return ResultUtil.error("操作异常，请刷新订单");
+ return ResultUtil.error(language == 1 ? "操作失败，请刷新订单" : language == 2 ? "Operation failed, please refresh the order" : "L’opération a échoué, veuillez actualiser la commande");
}
if(orderLogistics.getArriveTime()==null){
orderLogistics.setArriveTime(orderLogistics.getStartServiceTime());
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/IOrderPrivateCarService.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/IOrderPrivateCarService.java
index 9159976..d98f3ee 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/IOrderPrivateCarService.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/IOrderPrivateCarService.java
@@ -86,7 +86,7 @@
* @return
* @throws Exception
*/
- ResultUtil confirmFees(Integer language, Integer orderId, Integer type, Double parkingFee, Double crossingFee) throws Exception;
+ ResultUtil confirmFees(Integer language, Integer orderId, Integer type, Double parkingFee, Double crossingFee, Integer uid) throws Exception;
/**
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index d1feb6d..3ab7da3 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -604,10 +604,13 @@
* @throws Exception
*/
@Override
- public ResultUtil confirmFees(Integer language, Integer orderId, Integer type, Double parkingFee, Double crossingFee) throws Exception {
+ public ResultUtil confirmFees(Integer language, Integer orderId, Integer type, Double parkingFee, Double crossingFee, Integer uid) throws Exception {
OrderPrivateCar orderPrivateCar = this.selectById(orderId);
+ if(!uid.equals(orderPrivateCar.getDriverId())){
+ return ResultUtil.error(language == 1 ? "操作失败，请刷新订单" : language == 2 ? "Operation failed, please refresh the order" : "L’opération a échoué, veuillez actualiser la commande");
+ }
if(6 != orderPrivateCar.getState()){
- return ResultUtil.error("操作异常，请刷新订单");
+ return ResultUtil.error(language == 1 ? "操作失败，请刷新订单" : language == 2 ? "Operation failed, please refresh the order" : "L’opération a échoué, veuillez actualiser la commande");
}
if(orderPrivateCar.getArriveTime()==null){
orderPrivateCar.setArriveTime(orderPrivateCar.getStartServiceTime());
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CarModelMapper.xml b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CarModelMapper.xml
index 7b1550c..cb3713c 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CarModelMapper.xml
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CarModelMapper.xml
@@ -18,6 +18,6 @@
select
id as id,
name as name
- from t_car_model where state = 1 and brandId = #{brandId} and remark != '1'
+ from t_car_model where state = 1 and brandId = #{brandId}
</select>
</mapper>
\ No newline at end of file
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOrderService.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOrderService.java
index f52d8b0..e803534 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOrderService.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOrderService.java
@@ -115,7 +115,8 @@
* @return
* @throws Exception
*/
- ResultUtil confirmFees(Integer language, Integer orderId, Integer orderType, Integer type, Double travelFee, Double parkingFee, Double crossingFee) throws Exception;
+ ResultUtil confirmFees(Integer language, Integer orderId, Integer orderType, Integer type,
+ Double travelFee, Double parkingFee, Double crossingFee, Integer uid) throws Exception;
/**
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
index 4f54b5c..9059077 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
@@ -1096,6 +1096,25 @@
loginWarpper.setJumpCode("200000");
}
}
+ if(null != driver.getCarId()){
+ Car car = carService.selectById(driver.getCarId());
+ if(!StringUtils.hasLength(car.getVehicleId())){
+ car.setVehicleId(UUIDUtil.getRandomCode());
+ carService.updateById(car);
+ }
+ new Thread(()->{
+ try {
+ CarModel carModel = carModelMapper.selectById(car.getCarModelId());
+ String vehicles = fleetEngineUtil.getVehicles(car.getVehicleId());
+ if(ToolUtil.isEmpty(vehicles)) {
+ fleetEngineUtil.createVehicles(carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }).start();
+ loginWarpper.setVehicleId(car.getVehicleId());
+ }
return ResultUtil.success(loginWarpper);
}
@@ -1193,14 +1212,20 @@
}
//司机下班，修改谷歌上的车辆信息
- CarModel carModel = carModelMapper.selectById(car.getCarModelId());
- String vehicles = fleetEngineUtil.getVehicles(car.getVehicleId());
- if(ToolUtil.isEmpty(vehicles)){
- fleetEngineUtil.createVehicles(carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
- fleetEngineUtil.updateVehicles("OFFLINE", carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
- }else{
- fleetEngineUtil.updateVehicles("OFFLINE", carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
- }
+ new Thread(()->{
+ try {
+ CarModel carModel = carModelMapper.selectById(car.getCarModelId());
+ String vehicles = fleetEngineUtil.getVehicles(car.getVehicleId());
+ if(ToolUtil.isEmpty(vehicles)){
+ fleetEngineUtil.createVehicles(carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
+ fleetEngineUtil.updateVehicles("OFFLINE", carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
+ }else{
+ fleetEngineUtil.updateVehicles("OFFLINE", carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }).start();
switch (language){
case 1:
audioUrl = "http://182.160.16.251:81/files/audio/system/AfterWork-CN.mp3";
@@ -1254,14 +1279,23 @@
}
//司机上班，修改谷歌上的车辆信息
- CarModel carModel = carModelMapper.selectById(car.getCarModelId());
- String vehicles = fleetEngineUtil.getVehicles(car.getVehicleId());
- if(ToolUtil.isEmpty(vehicles)){
- fleetEngineUtil.createVehicles(carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
- fleetEngineUtil.updateVehicles("ONLINE", carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
- }else{
- fleetEngineUtil.updateVehicles("ONLINE", carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
- }
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ CarModel carModel = carModelMapper.selectById(car.getCarModelId());
+ String vehicles = fleetEngineUtil.getVehicles(car.getVehicleId());
+ if(ToolUtil.isEmpty(vehicles)){
+ fleetEngineUtil.createVehicles(carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
+ fleetEngineUtil.updateVehicles("ONLINE", carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
+ }else{
+ fleetEngineUtil.updateVehicles("ONLINE", carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+ }).start();
switch (language){
case 1:
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java
index 7d1b17e..df60022 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java
@@ -603,16 +603,17 @@
* @throws Exception
*/
@Override
- public ResultUtil confirmFees(Integer language, Integer orderId, Integer orderType, Integer type, Double travelFee, Double parkingFee, Double crossingFee) throws Exception {
+ public ResultUtil confirmFees(Integer language, Integer orderId, Integer orderType, Integer type, Double travelFee,
+ Double parkingFee, Double crossingFee, Integer uid) throws Exception {
switch (orderType){
case 1://专车
- return orderPrivateCarService.confirmFees(language, orderId, type, parkingFee, crossingFee);
+ return orderPrivateCarService.confirmFees(language, orderId, type, parkingFee, crossingFee, uid);
case 2://出租
return orderTaxiService.confirmFees(orderId, type, travelFee, parkingFee, crossingFee);
case 3://城际（没有此流程）
break;
case 4://
- return orderLogisticsService.confirmFees(language, orderId, type, parkingFee, crossingFee);
+ return orderLogisticsService.confirmFees(language, orderId, type, parkingFee, crossingFee, uid);
case 5:
break;
case 6:
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TIntegralOrderController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TIntegralOrderController.java
index 8a20baa..2c0b66c 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TIntegralOrderController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TIntegralOrderController.java
@@ -9,9 +9,7 @@
import com.stylefeng.guns.modular.system.model.TEmail;
import com.stylefeng.guns.modular.system.model.TOrderCharter;
import com.stylefeng.guns.modular.system.model.TUser;
-import com.stylefeng.guns.modular.system.service.ITUserService;
-import com.stylefeng.guns.modular.system.service.IUserService;
-import com.stylefeng.guns.modular.system.service.TEmailService;
+import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.EmailUtil;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
@@ -26,7 +24,6 @@
import com.stylefeng.guns.core.log.LogObjectHolder;
import org.springframework.web.bind.annotation.RequestParam;
import com.stylefeng.guns.modular.system.model.TIntegralOrder;
-import com.stylefeng.guns.modular.system.service.ITIntegralOrderService;
import javax.annotation.Resource;
import java.io.File;
@@ -57,6 +54,9 @@
@Resource
private TEmailService emailService;
+
+ @Resource
+ private ITSystemNoticeService systemNoticeService;
@@ -123,10 +123,18 @@
tIntegralOrder.setRemark(null);
tIntegralOrderService.updateById(tIntegralOrder);
TIntegralOrder tIntegralOrder1 = tIntegralOrderService.selectById(tIntegralOrder.getId());
+ TUser tUser = userService.selectById(tIntegralOrder1.getUserId());
+ try {
+ Integer language = tUser.getLanguage();
+ systemNoticeService.addSystemNotice(1, language == 1 ? "您的积分兑换请求已通过审核，平台客服将会联系您，请耐心等待！" :
+ language == 2 ? "Your points redemption request has been approved, and I-GO customer service will contact you. Please be patient!" :
+ "Votre demande d’échange de points a été approuvée et le service client d’I-GO vous contactera. Soyez patient !", tIntegralOrder.getUserId());
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
new Thread(new Runnable() {
@Override
public void run() {
- TUser tUser = userService.selectById(tIntegralOrder1.getUserId());
if(ToolUtil.isNotEmpty(tUser.getEmail())){
try {
Integer language = tUser.getLanguage();
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 40e2820..43aa8b6 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
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.google.api.client.http.UrlEncodedParser;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.CharteredCar.server.IOrderCharteredCarService;
import com.stylefeng.guns.modular.crossCity.model.OrderCrossCity;
@@ -27,8 +28,12 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.http.client.utils.URLEncodedUtils;
+import org.bouncycastle.util.encoders.UrlBase64Encoder;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -37,6 +42,8 @@
import java.io.*;
import java.math.BigDecimal;
import java.math.RoundingMode;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -917,6 +924,20 @@
if(null == uid){
return ResultUtil.tokenErr();
}
+ reason = reason.replaceAll("& #40;", "(")
+ .replaceAll("& #41;", ")")
+ .replaceAll("& #40;", "(")
+ .replaceAll("& #41;", ")")
+ .replaceAll("& #39;", "'")
+ .replaceAll("& lt;", "<")
+ .replaceAll("& gt;", ">");
+ remark = remark.replaceAll("& #40;", "(")
+ .replaceAll("& #41;", ")")
+ .replaceAll("& #40;", "(")
+ .replaceAll("& #41;", ")")
+ .replaceAll("& #39;", "'")
+ .replaceAll("& lt;", "<")
+ .replaceAll("& gt;", ">");
switch (orderType){
case 1:
return orderPrivateCarService.addCancle(id, reason, remark, uid, lon, lat, address, language);
@@ -937,8 +958,9 @@
return ResultUtil.runErr();
}
}
-
-
+
+
+
/**
* 取消订单退款回调
* @param request
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
index a33ef17..66ee3c6 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
@@ -1277,8 +1277,43 @@
document.getElementsByTag("title").get(0).text("I-GO电子收据");
Element title_chinese = document.getElementById("title_chinese");
title_chinese.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，您在I-GO此订单消费GHS " + orderLogistics.getPayMoney());
- Element xcf_chinese = document.getElementById("xcf_chinese");
- xcf_chinese.text("GHS " + new BigDecimal(orderLogistics.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element qbj_chinese = document.getElementById("qbj_chinese");
+ qbj_chinese.text("GHS " + new BigDecimal(orderLogistics.getStartMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element scf_chinese = document.getElementById("scf_chinese");
+ if(null != orderLogistics.getDurationMoney() && orderLogistics.getDurationMoney() > 0){
+ scf_chinese.text("GHS " + new BigDecimal(orderLogistics.getDurationMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element scf_chinese_div = document.getElementById("scf_chinese_div");
+ scf_chinese_div.remove();
+ }
+ Element lcf_chinese = document.getElementById("lcf_chinese");
+ if(null != orderLogistics.getMileageMoney() && orderLogistics.getMileageMoney() > 0){
+ lcf_chinese.text("GHS " + new BigDecimal(orderLogistics.getMileageMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element lcf_chinese_div = document.getElementById("lcf_chinese_div");
+ lcf_chinese_div.remove();
+ }
+ Element ddf_chinese = document.getElementById("ddf_chinese");
+ if(null != orderLogistics.getWaitMoney() && orderLogistics.getWaitMoney() > 0){
+ ddf_chinese.text("GHS " + new BigDecimal(orderLogistics.getWaitMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element ddf_chinese_div = document.getElementById("ddf_chinese_div");
+ ddf_chinese_div.remove();
+ }
+ Element glf_chinese = document.getElementById("glf_chinese");
+ if(null != orderLogistics.getRoadTollMoney() && orderLogistics.getRoadTollMoney() > 0){
+ glf_chinese.text("GHS " + new BigDecimal(orderLogistics.getRoadTollMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element glf_chinese_div = document.getElementById("glf_chinese_div");
+ glf_chinese_div.remove();
+ }
+ Element tcf_chinese = document.getElementById("tcf_chinese");
+ if(null != orderLogistics.getParkMoney() && orderLogistics.getParkMoney() > 0){
+ tcf_chinese.text("GHS " + new BigDecimal(orderLogistics.getParkMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element tcf_chinese_div = document.getElementById("tcf_chinese_div");
+ tcf_chinese_div.remove();
+ }
Element bcj_chinese = document.getElementById("bcj_chinese");
if(null != orderLogistics.getPriceDifference() && orderLogistics.getPriceDifference() > 0){
bcj_chinese.text("GHS " + new BigDecimal(orderLogistics.getPriceDifference()).setScale(2, RoundingMode.HALF_EVEN));
@@ -1344,8 +1379,43 @@
document.getElementsByTag("title").get(0).text("Receipt");
Element title_english = document.getElementById("title_english");
title_english.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，You spent GHS " + orderLogistics.getPayMoney() + " on the trip ");
- Element xcf_english = document.getElementById("xcf_english");
- xcf_english.text("GHS " + new BigDecimal(orderLogistics.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element qbj_english = document.getElementById("qbj_english");
+ qbj_english.text("GHS " + new BigDecimal(orderLogistics.getStartMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element scf_english = document.getElementById("scf_english");
+ if(null != orderLogistics.getDurationMoney() && orderLogistics.getDurationMoney() > 0){
+ scf_english.text("GHS " + new BigDecimal(orderLogistics.getDurationMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element scf_english_div = document.getElementById("scf_english_div");
+ scf_english_div.remove();
+ }
+ Element lcf_english = document.getElementById("lcf_english");
+ if(null != orderLogistics.getMileageMoney() && orderLogistics.getMileageMoney() > 0){
+ lcf_english.text("GHS " + new BigDecimal(orderLogistics.getMileageMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element lcf_english_div = document.getElementById("lcf_english_div");
+ lcf_english_div.remove();
+ }
+ Element ddf_english = document.getElementById("ddf_english");
+ if(null != orderLogistics.getWaitMoney() && orderLogistics.getWaitMoney() > 0){
+ ddf_english.text("GHS " + new BigDecimal(orderLogistics.getWaitMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element ddf_english_div = document.getElementById("ddf_english_div");
+ ddf_english_div.remove();
+ }
+ Element glf_english = document.getElementById("glf_english");
+ if(null != orderLogistics.getRoadTollMoney() && orderLogistics.getRoadTollMoney() > 0){
+ glf_english.text("GHS " + new BigDecimal(orderLogistics.getRoadTollMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element glf_english_div = document.getElementById("glf_english_div");
+ glf_english_div.remove();
+ }
+ Element tcf_english = document.getElementById("tcf_english");
+ if(null != orderLogistics.getParkMoney() && orderLogistics.getParkMoney() > 0){
+ tcf_english.text("GHS " + new BigDecimal(orderLogistics.getParkMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element tcf_english_div = document.getElementById("tcf_english_div");
+ tcf_english_div.remove();
+ }
Element bcj_english = document.getElementById("bcj_english");
if(null != orderLogistics.getPriceDifference() && orderLogistics.getPriceDifference() > 0){
bcj_english.text("GHS " + new BigDecimal(orderLogistics.getPriceDifference()).setScale(2, RoundingMode.HALF_EVEN));
@@ -1411,8 +1481,43 @@
document.getElementsByTag("title").get(0).text("Reçu");
Element title_french = document.getElementById("title_french");
title_french.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，Vous consommez GHS " + orderLogistics.getPayMoney() + " sur votre commande i-go1 le ");
- Element xcf_french = document.getElementById("xcf_french");
- xcf_french.text("GHS " + new BigDecimal(orderLogistics.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element qbj_french = document.getElementById("qbj_french");
+ qbj_french.text("GHS " + new BigDecimal(orderLogistics.getStartMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element scf_french = document.getElementById("scf_french");
+ if(null != orderLogistics.getDurationMoney() && orderLogistics.getDurationMoney() > 0){
+ scf_french.text("GHS " + new BigDecimal(orderLogistics.getDurationMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element scf_french_div = document.getElementById("scf_french_div");
+ scf_french_div.remove();
+ }
+ Element lcf_french = document.getElementById("lcf_french");
+ if(null != orderLogistics.getMileageMoney() && orderLogistics.getMileageMoney() > 0){
+ lcf_french.text("GHS " + new BigDecimal(orderLogistics.getMileageMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element lcf_french_div = document.getElementById("lcf_french_div");
+ lcf_french_div.remove();
+ }
+ Element ddf_french = document.getElementById("ddf_french");
+ if(null != orderLogistics.getWaitMoney() && orderLogistics.getWaitMoney() > 0){
+ ddf_french.text("GHS " + new BigDecimal(orderLogistics.getWaitMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element ddf_french_div = document.getElementById("ddf_french_div");
+ ddf_french_div.remove();
+ }
+ Element glf_french = document.getElementById("glf_french");
+ if(null != orderLogistics.getRoadTollMoney() && orderLogistics.getRoadTollMoney() > 0){
+ glf_french.text("GHS " + new BigDecimal(orderLogistics.getRoadTollMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element glf_french_div = document.getElementById("glf_french_div");
+ glf_french_div.remove();
+ }
+ Element tcf_french = document.getElementById("tcf_french");
+ if(null != orderLogistics.getParkMoney() && orderLogistics.getParkMoney() > 0){
+ tcf_french.text("GHS " + new BigDecimal(orderLogistics.getParkMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element tcf_french_div = document.getElementById("tcf_french_div");
+ tcf_french_div.remove();
+ }
Element bcj_french = document.getElementById("bcj_french");
if(null != orderLogistics.getPriceDifference() && orderLogistics.getPriceDifference() > 0){
bcj_french.text("GHS " + new BigDecimal(orderLogistics.getPriceDifference()).setScale(2, RoundingMode.HALF_EVEN));
@@ -1688,8 +1793,43 @@
document.getElementsByTag("title").get(0).text("I-GO电子收据");
Element title_chinese = document.getElementById("title_chinese");
title_chinese.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，您在I-GO此订单消费GHS " + orderLogistics.getPayMoney());
- Element xcf_chinese = document.getElementById("xcf_chinese");
- xcf_chinese.text("GHS " + new BigDecimal(orderLogistics.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element qbj_chinese = document.getElementById("qbj_chinese");
+ qbj_chinese.text("GHS " + new BigDecimal(orderLogistics.getStartMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element scf_chinese = document.getElementById("scf_chinese");
+ if(null != orderLogistics.getDurationMoney() && orderLogistics.getDurationMoney() > 0){
+ scf_chinese.text("GHS " + new BigDecimal(orderLogistics.getDurationMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element scf_chinese_div = document.getElementById("scf_chinese_div");
+ scf_chinese_div.remove();
+ }
+ Element lcf_chinese = document.getElementById("lcf_chinese");
+ if(null != orderLogistics.getMileageMoney() && orderLogistics.getMileageMoney() > 0){
+ lcf_chinese.text("GHS " + new BigDecimal(orderLogistics.getMileageMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element lcf_chinese_div = document.getElementById("lcf_chinese_div");
+ lcf_chinese_div.remove();
+ }
+ Element ddf_chinese = document.getElementById("ddf_chinese");
+ if(null != orderLogistics.getWaitMoney() && orderLogistics.getWaitMoney() > 0){
+ ddf_chinese.text("GHS " + new BigDecimal(orderLogistics.getWaitMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element ddf_chinese_div = document.getElementById("ddf_chinese_div");
+ ddf_chinese_div.remove();
+ }
+ Element glf_chinese = document.getElementById("glf_chinese");
+ if(null != orderLogistics.getRoadTollMoney() && orderLogistics.getRoadTollMoney() > 0){
+ glf_chinese.text("GHS " + new BigDecimal(orderLogistics.getRoadTollMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element glf_chinese_div = document.getElementById("glf_chinese_div");
+ glf_chinese_div.remove();
+ }
+ Element tcf_chinese = document.getElementById("tcf_chinese");
+ if(null != orderLogistics.getParkMoney() && orderLogistics.getParkMoney() > 0){
+ tcf_chinese.text("GHS " + new BigDecimal(orderLogistics.getParkMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element tcf_chinese_div = document.getElementById("tcf_chinese_div");
+ tcf_chinese_div.remove();
+ }
Element bcj_chinese = document.getElementById("bcj_chinese");
if(null != orderLogistics.getPriceDifference() && orderLogistics.getPriceDifference() > 0){
bcj_chinese.text("GHS " + new BigDecimal(orderLogistics.getPriceDifference()).setScale(2, RoundingMode.HALF_EVEN));
@@ -1755,8 +1895,43 @@
document.getElementsByTag("title").get(0).text("Receipt");
Element title_english = document.getElementById("title_english");
title_english.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，You spent GHS " + orderLogistics.getPayMoney() + " on the trip ");
- Element xcf_english = document.getElementById("xcf_english");
- xcf_english.text("GHS " + new BigDecimal(orderLogistics.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element qbj_english = document.getElementById("qbj_english");
+ qbj_english.text("GHS " + new BigDecimal(orderLogistics.getStartMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element scf_english = document.getElementById("scf_english");
+ if(null != orderLogistics.getDurationMoney() && orderLogistics.getDurationMoney() > 0){
+ scf_english.text("GHS " + new BigDecimal(orderLogistics.getDurationMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element scf_english_div = document.getElementById("scf_english_div");
+ scf_english_div.remove();
+ }
+ Element lcf_english = document.getElementById("lcf_english");
+ if(null != orderLogistics.getMileageMoney() && orderLogistics.getMileageMoney() > 0){
+ lcf_english.text("GHS " + new BigDecimal(orderLogistics.getMileageMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element lcf_english_div = document.getElementById("lcf_english_div");
+ lcf_english_div.remove();
+ }
+ Element ddf_english = document.getElementById("ddf_english");
+ if(null != orderLogistics.getWaitMoney() && orderLogistics.getWaitMoney() > 0){
+ ddf_english.text("GHS " + new BigDecimal(orderLogistics.getWaitMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element ddf_english_div = document.getElementById("ddf_english_div");
+ ddf_english_div.remove();
+ }
+ Element glf_english = document.getElementById("glf_english");
+ if(null != orderLogistics.getRoadTollMoney() && orderLogistics.getRoadTollMoney() > 0){
+ glf_english.text("GHS " + new BigDecimal(orderLogistics.getRoadTollMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element glf_english_div = document.getElementById("glf_english_div");
+ glf_english_div.remove();
+ }
+ Element tcf_english = document.getElementById("tcf_english");
+ if(null != orderLogistics.getParkMoney() && orderLogistics.getParkMoney() > 0){
+ tcf_english.text("GHS " + new BigDecimal(orderLogistics.getParkMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element tcf_english_div = document.getElementById("tcf_english_div");
+ tcf_english_div.remove();
+ }
Element bcj_english = document.getElementById("bcj_english");
if(null != orderLogistics.getPriceDifference() && orderLogistics.getPriceDifference() > 0){
bcj_english.text("GHS " + new BigDecimal(orderLogistics.getPriceDifference()).setScale(2, RoundingMode.HALF_EVEN));
@@ -1822,8 +1997,43 @@
document.getElementsByTag("title").get(0).text("Reçu");
Element title_french = document.getElementById("title_french");
title_french.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，Vous consommez GHS " + orderLogistics.getPayMoney() + " sur votre commande i-go1 le ");
- Element xcf_french = document.getElementById("xcf_french");
- xcf_french.text("GHS " + new BigDecimal(orderLogistics.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element qbj_french = document.getElementById("qbj_french");
+ qbj_french.text("GHS " + new BigDecimal(orderLogistics.getStartMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element scf_french = document.getElementById("scf_french");
+ if(null != orderLogistics.getDurationMoney() && orderLogistics.getDurationMoney() > 0){
+ scf_french.text("GHS " + new BigDecimal(orderLogistics.getDurationMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element scf_french_div = document.getElementById("scf_french_div");
+ scf_french_div.remove();
+ }
+ Element lcf_french = document.getElementById("lcf_french");
+ if(null != orderLogistics.getMileageMoney() && orderLogistics.getMileageMoney() > 0){
+ lcf_french.text("GHS " + new BigDecimal(orderLogistics.getMileageMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element lcf_french_div = document.getElementById("lcf_french_div");
+ lcf_french_div.remove();
+ }
+ Element ddf_french = document.getElementById("ddf_french");
+ if(null != orderLogistics.getWaitMoney() && orderLogistics.getWaitMoney() > 0){
+ ddf_french.text("GHS " + new BigDecimal(orderLogistics.getWaitMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element ddf_french_div = document.getElementById("ddf_french_div");
+ ddf_french_div.remove();
+ }
+ Element glf_french = document.getElementById("glf_french");
+ if(null != orderLogistics.getRoadTollMoney() && orderLogistics.getRoadTollMoney() > 0){
+ glf_french.text("GHS " + new BigDecimal(orderLogistics.getRoadTollMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element glf_french_div = document.getElementById("glf_french_div");
+ glf_french_div.remove();
+ }
+ Element tcf_french = document.getElementById("tcf_french");
+ if(null != orderLogistics.getParkMoney() && orderLogistics.getParkMoney() > 0){
+ tcf_french.text("GHS " + new BigDecimal(orderLogistics.getParkMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element tcf_french_div = document.getElementById("tcf_french_div");
+ tcf_french_div.remove();
+ }
Element bcj_french = document.getElementById("bcj_french");
if(null != orderLogistics.getPriceDifference() && orderLogistics.getPriceDifference() > 0){
bcj_french.text("GHS " + new BigDecimal(orderLogistics.getPriceDifference()).setScale(2, RoundingMode.HALF_EVEN));
@@ -2200,8 +2410,43 @@
document.getElementsByTag("title").get(0).text("I-GO电子收据");
Element title_chinese = document.getElementById("title_chinese");
title_chinese.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，您在I-GO此订单消费GHS " + orderLogistics.getPayMoney());
- Element xcf_chinese = document.getElementById("xcf_chinese");
- xcf_chinese.text("GHS " + new BigDecimal(orderLogistics.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element qbj_chinese = document.getElementById("qbj_chinese");
+ qbj_chinese.text("GHS " + new BigDecimal(orderLogistics.getStartMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element scf_chinese = document.getElementById("scf_chinese");
+ if(null != orderLogistics.getDurationMoney() && orderLogistics.getDurationMoney() > 0){
+ scf_chinese.text("GHS " + new BigDecimal(orderLogistics.getDurationMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element scf_chinese_div = document.getElementById("scf_chinese_div");
+ scf_chinese_div.remove();
+ }
+ Element lcf_chinese = document.getElementById("lcf_chinese");
+ if(null != orderLogistics.getMileageMoney() && orderLogistics.getMileageMoney() > 0){
+ lcf_chinese.text("GHS " + new BigDecimal(orderLogistics.getMileageMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element lcf_chinese_div = document.getElementById("lcf_chinese_div");
+ lcf_chinese_div.remove();
+ }
+ Element ddf_chinese = document.getElementById("ddf_chinese");
+ if(null != orderLogistics.getWaitMoney() && orderLogistics.getWaitMoney() > 0){
+ ddf_chinese.text("GHS " + new BigDecimal(orderLogistics.getWaitMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element ddf_chinese_div = document.getElementById("ddf_chinese_div");
+ ddf_chinese_div.remove();
+ }
+ Element glf_chinese = document.getElementById("glf_chinese");
+ if(null != orderLogistics.getRoadTollMoney() && orderLogistics.getRoadTollMoney() > 0){
+ glf_chinese.text("GHS " + new BigDecimal(orderLogistics.getRoadTollMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element glf_chinese_div = document.getElementById("glf_chinese_div");
+ glf_chinese_div.remove();
+ }
+ Element tcf_chinese = document.getElementById("tcf_chinese");
+ if(null != orderLogistics.getParkMoney() && orderLogistics.getParkMoney() > 0){
+ tcf_chinese.text("GHS " + new BigDecimal(orderLogistics.getParkMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element tcf_chinese_div = document.getElementById("tcf_chinese_div");
+ tcf_chinese_div.remove();
+ }
Element bcj_chinese = document.getElementById("bcj_chinese");
if(null != orderLogistics.getPriceDifference() && orderLogistics.getPriceDifference() > 0){
bcj_chinese.text("GHS " + new BigDecimal(orderLogistics.getPriceDifference()).setScale(2, RoundingMode.HALF_EVEN));
@@ -2267,8 +2512,43 @@
document.getElementsByTag("title").get(0).text("Receipt");
Element title_english = document.getElementById("title_english");
title_english.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，You spent GHS " + orderLogistics.getPayMoney() + " on the trip ");
- Element xcf_english = document.getElementById("xcf_english");
- xcf_english.text("GHS " + new BigDecimal(orderLogistics.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element qbj_english = document.getElementById("qbj_english");
+ qbj_english.text("GHS " + new BigDecimal(orderLogistics.getStartMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element scf_english = document.getElementById("scf_english");
+ if(null != orderLogistics.getDurationMoney() && orderLogistics.getDurationMoney() > 0){
+ scf_english.text("GHS " + new BigDecimal(orderLogistics.getDurationMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element scf_english_div = document.getElementById("scf_english_div");
+ scf_english_div.remove();
+ }
+ Element lcf_english = document.getElementById("lcf_english");
+ if(null != orderLogistics.getMileageMoney() && orderLogistics.getMileageMoney() > 0){
+ lcf_english.text("GHS " + new BigDecimal(orderLogistics.getMileageMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element lcf_english_div = document.getElementById("lcf_english_div");
+ lcf_english_div.remove();
+ }
+ Element ddf_english = document.getElementById("ddf_english");
+ if(null != orderLogistics.getWaitMoney() && orderLogistics.getWaitMoney() > 0){
+ ddf_english.text("GHS " + new BigDecimal(orderLogistics.getWaitMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element ddf_english_div = document.getElementById("ddf_english_div");
+ ddf_english_div.remove();
+ }
+ Element glf_english = document.getElementById("glf_english");
+ if(null != orderLogistics.getRoadTollMoney() && orderLogistics.getRoadTollMoney() > 0){
+ glf_english.text("GHS " + new BigDecimal(orderLogistics.getRoadTollMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element glf_english_div = document.getElementById("glf_english_div");
+ glf_english_div.remove();
+ }
+ Element tcf_english = document.getElementById("tcf_english");
+ if(null != orderLogistics.getParkMoney() && orderLogistics.getParkMoney() > 0){
+ tcf_english.text("GHS " + new BigDecimal(orderLogistics.getParkMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element tcf_english_div = document.getElementById("tcf_english_div");
+ tcf_english_div.remove();
+ }
Element bcj_english = document.getElementById("bcj_english");
if(null != orderLogistics.getPriceDifference() && orderLogistics.getPriceDifference() > 0){
bcj_english.text("GHS " + new BigDecimal(orderLogistics.getPriceDifference()).setScale(2, RoundingMode.HALF_EVEN));
@@ -2334,8 +2614,43 @@
document.getElementsByTag("title").get(0).text("Reçu");
Element title_french = document.getElementById("title_french");
title_french.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，Vous consommez GHS " + orderLogistics.getPayMoney() + " sur votre commande i-go1 le ");
- Element xcf_french = document.getElementById("xcf_french");
- xcf_french.text("GHS " + new BigDecimal(orderLogistics.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element qbj_french = document.getElementById("qbj_french");
+ qbj_french.text("GHS " + new BigDecimal(orderLogistics.getStartMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element scf_french = document.getElementById("scf_french");
+ if(null != orderLogistics.getDurationMoney() && orderLogistics.getDurationMoney() > 0){
+ scf_french.text("GHS " + new BigDecimal(orderLogistics.getDurationMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element scf_french_div = document.getElementById("scf_french_div");
+ scf_french_div.remove();
+ }
+ Element lcf_french = document.getElementById("lcf_french");
+ if(null != orderLogistics.getMileageMoney() && orderLogistics.getMileageMoney() > 0){
+ lcf_french.text("GHS " + new BigDecimal(orderLogistics.getMileageMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element lcf_french_div = document.getElementById("lcf_french_div");
+ lcf_french_div.remove();
+ }
+ Element ddf_french = document.getElementById("ddf_french");
+ if(null != orderLogistics.getWaitMoney() && orderLogistics.getWaitMoney() > 0){
+ ddf_french.text("GHS " + new BigDecimal(orderLogistics.getWaitMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element ddf_french_div = document.getElementById("ddf_french_div");
+ ddf_french_div.remove();
+ }
+ Element glf_french = document.getElementById("glf_french");
+ if(null != orderLogistics.getRoadTollMoney() && orderLogistics.getRoadTollMoney() > 0){
+ glf_french.text("GHS " + new BigDecimal(orderLogistics.getRoadTollMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element glf_french_div = document.getElementById("glf_french_div");
+ glf_french_div.remove();
+ }
+ Element tcf_french = document.getElementById("tcf_french");
+ if(null != orderLogistics.getParkMoney() && orderLogistics.getParkMoney() > 0){
+ tcf_french.text("GHS " + new BigDecimal(orderLogistics.getParkMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element tcf_french_div = document.getElementById("tcf_french_div");
+ tcf_french_div.remove();
+ }
Element bcj_french = document.getElementById("bcj_french");
if(null != orderLogistics.getPriceDifference() && orderLogistics.getPriceDifference() > 0){
bcj_french.text("GHS " + new BigDecimal(orderLogistics.getPriceDifference()).setScale(2, RoundingMode.HALF_EVEN));
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 25f5f7b..a72144f 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
@@ -1435,8 +1435,43 @@
document.getElementsByTag("title").get(0).text("I-GO电子收据");
Element title_chinese = document.getElementById("title_chinese");
title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，您在I-GO此订单消费GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
- Element xcf_chinese = document.getElementById("xcf_chinese");
- xcf_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element qbj_chinese = document.getElementById("qbj_chinese");
+ qbj_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getStartMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element scf_chinese = document.getElementById("scf_chinese");
+ if(null != orderPrivateCar.getDurationMoney() && orderPrivateCar.getDurationMoney() > 0){
+ scf_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getDurationMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element scf_chinese_div = document.getElementById("scf_chinese_div");
+ scf_chinese_div.remove();
+ }
+ Element lcf_chinese = document.getElementById("lcf_chinese");
+ if(null != orderPrivateCar.getMileageMoney() && orderPrivateCar.getMileageMoney() > 0){
+ lcf_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getMileageMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element lcf_chinese_div = document.getElementById("lcf_chinese_div");
+ lcf_chinese_div.remove();
+ }
+ Element ddf_chinese = document.getElementById("ddf_chinese");
+ if(null != orderPrivateCar.getWaitMoney() && orderPrivateCar.getWaitMoney() > 0){
+ ddf_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getWaitMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element ddf_chinese_div = document.getElementById("ddf_chinese_div");
+ ddf_chinese_div.remove();
+ }
+ Element glf_chinese = document.getElementById("glf_chinese");
+ if(null != orderPrivateCar.getRoadTollMoney() && orderPrivateCar.getRoadTollMoney() > 0){
+ glf_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getRoadTollMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element glf_chinese_div = document.getElementById("glf_chinese_div");
+ glf_chinese_div.remove();
+ }
+ Element tcf_chinese = document.getElementById("tcf_chinese");
+ if(null != orderPrivateCar.getParkMoney() && orderPrivateCar.getParkMoney() > 0){
+ tcf_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getParkMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element tcf_chinese_div = document.getElementById("tcf_chinese_div");
+ tcf_chinese_div.remove();
+ }
if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
Element yhq_chinese = document.getElementById("yhq_chinese");
yhq_chinese.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
@@ -1501,8 +1536,43 @@
document.getElementsByTag("title").get(0).text("Receipt");
Element title_english = document.getElementById("title_english");
title_english.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，You spent GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue() + " on the trip ");
- Element xcf_english = document.getElementById("xcf_english");
- xcf_english.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element qbj_english = document.getElementById("qbj_english");
+ qbj_english.text("GHS " + new BigDecimal(orderPrivateCar.getStartMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element scf_english = document.getElementById("scf_english");
+ if(null != orderPrivateCar.getDurationMoney() && orderPrivateCar.getDurationMoney() > 0){
+ scf_english.text("GHS " + new BigDecimal(orderPrivateCar.getDurationMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element scf_english_div = document.getElementById("scf_english_div");
+ scf_english_div.remove();
+ }
+ Element lcf_english = document.getElementById("lcf_english");
+ if(null != orderPrivateCar.getMileageMoney() && orderPrivateCar.getMileageMoney() > 0){
+ lcf_english.text("GHS " + new BigDecimal(orderPrivateCar.getMileageMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element lcf_english_div = document.getElementById("lcf_english_div");
+ lcf_english_div.remove();
+ }
+ Element ddf_english = document.getElementById("ddf_english");
+ if(null != orderPrivateCar.getWaitMoney() && orderPrivateCar.getWaitMoney() > 0){
+ ddf_english.text("GHS " + new BigDecimal(orderPrivateCar.getWaitMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element ddf_english_div = document.getElementById("ddf_english_div");
+ ddf_english_div.remove();
+ }
+ Element glf_english = document.getElementById("glf_english");
+ if(null != orderPrivateCar.getRoadTollMoney() && orderPrivateCar.getRoadTollMoney() > 0){
+ glf_english.text("GHS " + new BigDecimal(orderPrivateCar.getRoadTollMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element glf_english_div = document.getElementById("glf_english_div");
+ glf_english_div.remove();
+ }
+ Element tcf_english = document.getElementById("tcf_english");
+ if(null != orderPrivateCar.getParkMoney() && orderPrivateCar.getParkMoney() > 0){
+ tcf_english.text("GHS " + new BigDecimal(orderPrivateCar.getParkMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element tcf_english_div = document.getElementById("tcf_english_div");
+ tcf_english_div.remove();
+ }
if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
Element yhq_english = document.getElementById("yhq_english");
yhq_english.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
@@ -1567,8 +1637,43 @@
document.getElementsByTag("title").get(0).text("Reçu");
Element title_french = document.getElementById("title_french");
title_french.text("Le " + DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + ", vous avez dépensé GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue() + " sur le voyage");
- Element xcf_french = document.getElementById("xcf_french");
- xcf_french.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element qbj_french = document.getElementById("qbj_french");
+ qbj_french.text("GHS " + new BigDecimal(orderPrivateCar.getStartMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element scf_french = document.getElementById("scf_french");
+ if(null != orderPrivateCar.getDurationMoney() && orderPrivateCar.getDurationMoney() > 0){
+ scf_french.text("GHS " + new BigDecimal(orderPrivateCar.getDurationMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element scf_french_div = document.getElementById("scf_french_div");
+ scf_french_div.remove();
+ }
+ Element lcf_french = document.getElementById("lcf_french");
+ if(null != orderPrivateCar.getMileageMoney() && orderPrivateCar.getMileageMoney() > 0){
+ lcf_french.text("GHS " + new BigDecimal(orderPrivateCar.getMileageMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element lcf_french_div = document.getElementById("lcf_french_div");
+ lcf_french_div.remove();
+ }
+ Element ddf_french = document.getElementById("ddf_french");
+ if(null != orderPrivateCar.getWaitMoney() && orderPrivateCar.getWaitMoney() > 0){
+ ddf_french.text("GHS " + new BigDecimal(orderPrivateCar.getWaitMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element ddf_french_div = document.getElementById("ddf_french_div");
+ ddf_french_div.remove();
+ }
+ Element glf_french = document.getElementById("glf_french");
+ if(null != orderPrivateCar.getRoadTollMoney() && orderPrivateCar.getRoadTollMoney() > 0){
+ glf_french.text("GHS " + new BigDecimal(orderPrivateCar.getRoadTollMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element glf_french_div = document.getElementById("glf_french_div");
+ glf_french_div.remove();
+ }
+ Element tcf_french = document.getElementById("tcf_french");
+ if(null != orderPrivateCar.getParkMoney() && orderPrivateCar.getParkMoney() > 0){
+ tcf_french.text("GHS " + new BigDecimal(orderPrivateCar.getParkMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element tcf_french_div = document.getElementById("tcf_french_div");
+ tcf_french_div.remove();
+ }
if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
Element yhq_french = document.getElementById("yhq_french");
yhq_french.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
@@ -1847,8 +1952,43 @@
document.getElementsByTag("title").get(0).text("I-GO电子收据");
Element title_chinese = document.getElementById("title_chinese");
title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，您在I-GO此订单消费GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
- Element xcf_chinese = document.getElementById("xcf_chinese");
- xcf_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element qbj_chinese = document.getElementById("qbj_chinese");
+ qbj_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getStartMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element scf_chinese = document.getElementById("scf_chinese");
+ if(null != orderPrivateCar.getDurationMoney() && orderPrivateCar.getDurationMoney() > 0){
+ scf_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getDurationMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element scf_chinese_div = document.getElementById("scf_chinese_div");
+ scf_chinese_div.remove();
+ }
+ Element lcf_chinese = document.getElementById("lcf_chinese");
+ if(null != orderPrivateCar.getMileageMoney() && orderPrivateCar.getMileageMoney() > 0){
+ lcf_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getMileageMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element lcf_chinese_div = document.getElementById("lcf_chinese_div");
+ lcf_chinese_div.remove();
+ }
+ Element ddf_chinese = document.getElementById("ddf_chinese");
+ if(null != orderPrivateCar.getWaitMoney() && orderPrivateCar.getWaitMoney() > 0){
+ ddf_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getWaitMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element ddf_chinese_div = document.getElementById("ddf_chinese_div");
+ ddf_chinese_div.remove();
+ }
+ Element glf_chinese = document.getElementById("glf_chinese");
+ if(null != orderPrivateCar.getRoadTollMoney() && orderPrivateCar.getRoadTollMoney() > 0){
+ glf_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getRoadTollMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element glf_chinese_div = document.getElementById("glf_chinese_div");
+ glf_chinese_div.remove();
+ }
+ Element tcf_chinese = document.getElementById("tcf_chinese");
+ if(null != orderPrivateCar.getParkMoney() && orderPrivateCar.getParkMoney() > 0){
+ tcf_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getParkMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element tcf_chinese_div = document.getElementById("tcf_chinese_div");
+ tcf_chinese_div.remove();
+ }
if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
Element yhq_chinese = document.getElementById("yhq_chinese");
yhq_chinese.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
@@ -1913,8 +2053,43 @@
document.getElementsByTag("title").get(0).text("Receipt");
Element title_english = document.getElementById("title_english");
title_english.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，You spent GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue() + " on the trip ");
- Element xcf_english = document.getElementById("xcf_english");
- xcf_english.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element qbj_english = document.getElementById("qbj_english");
+ qbj_english.text("GHS " + new BigDecimal(orderPrivateCar.getStartMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element scf_english = document.getElementById("scf_english");
+ if(null != orderPrivateCar.getDurationMoney() && orderPrivateCar.getDurationMoney() > 0){
+ scf_english.text("GHS " + new BigDecimal(orderPrivateCar.getDurationMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element scf_english_div = document.getElementById("scf_english_div");
+ scf_english_div.remove();
+ }
+ Element lcf_english = document.getElementById("lcf_english");
+ if(null != orderPrivateCar.getMileageMoney() && orderPrivateCar.getMileageMoney() > 0){
+ lcf_english.text("GHS " + new BigDecimal(orderPrivateCar.getMileageMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element lcf_english_div = document.getElementById("lcf_english_div");
+ lcf_english_div.remove();
+ }
+ Element ddf_english = document.getElementById("ddf_english");
+ if(null != orderPrivateCar.getWaitMoney() && orderPrivateCar.getWaitMoney() > 0){
+ ddf_english.text("GHS " + new BigDecimal(orderPrivateCar.getWaitMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element ddf_english_div = document.getElementById("ddf_english_div");
+ ddf_english_div.remove();
+ }
+ Element glf_english = document.getElementById("glf_english");
+ if(null != orderPrivateCar.getRoadTollMoney() && orderPrivateCar.getRoadTollMoney() > 0){
+ glf_english.text("GHS " + new BigDecimal(orderPrivateCar.getRoadTollMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element glf_english_div = document.getElementById("glf_english_div");
+ glf_english_div.remove();
+ }
+ Element tcf_english = document.getElementById("tcf_english");
+ if(null != orderPrivateCar.getParkMoney() && orderPrivateCar.getParkMoney() > 0){
+ tcf_english.text("GHS " + new BigDecimal(orderPrivateCar.getParkMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element tcf_english_div = document.getElementById("tcf_english_div");
+ tcf_english_div.remove();
+ }
if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
Element yhq_english = document.getElementById("yhq_english");
yhq_english.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
@@ -1979,8 +2154,43 @@
document.getElementsByTag("title").get(0).text("Reçu");
Element title_french = document.getElementById("title_french");
title_french.text("Le " + DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + ", vous avez dépensé GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue() + " sur le voyage");
- Element xcf_french = document.getElementById("xcf_french");
- xcf_french.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element qbj_french = document.getElementById("qbj_french");
+ qbj_french.text("GHS " + new BigDecimal(orderPrivateCar.getStartMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element scf_french = document.getElementById("scf_french");
+ if(null != orderPrivateCar.getDurationMoney() && orderPrivateCar.getDurationMoney() > 0){
+ scf_french.text("GHS " + new BigDecimal(orderPrivateCar.getDurationMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element scf_french_div = document.getElementById("scf_french_div");
+ scf_french_div.remove();
+ }
+ Element lcf_french = document.getElementById("lcf_french");
+ if(null != orderPrivateCar.getMileageMoney() && orderPrivateCar.getMileageMoney() > 0){
+ lcf_french.text("GHS " + new BigDecimal(orderPrivateCar.getMileageMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element lcf_french_div = document.getElementById("lcf_french_div");
+ lcf_french_div.remove();
+ }
+ Element ddf_french = document.getElementById("ddf_french");
+ if(null != orderPrivateCar.getWaitMoney() && orderPrivateCar.getWaitMoney() > 0){
+ ddf_french.text("GHS " + new BigDecimal(orderPrivateCar.getWaitMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element ddf_french_div = document.getElementById("ddf_french_div");
+ ddf_french_div.remove();
+ }
+ Element glf_french = document.getElementById("glf_french");
+ if(null != orderPrivateCar.getRoadTollMoney() && orderPrivateCar.getRoadTollMoney() > 0){
+ glf_french.text("GHS " + new BigDecimal(orderPrivateCar.getRoadTollMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element glf_french_div = document.getElementById("glf_french_div");
+ glf_french_div.remove();
+ }
+ Element tcf_french = document.getElementById("tcf_french");
+ if(null != orderPrivateCar.getParkMoney() && orderPrivateCar.getParkMoney() > 0){
+ tcf_french.text("GHS " + new BigDecimal(orderPrivateCar.getParkMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element tcf_french_div = document.getElementById("tcf_french_div");
+ tcf_french_div.remove();
+ }
if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
Element yhq_french = document.getElementById("yhq_french");
yhq_french.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
@@ -2418,8 +2628,43 @@
document.getElementsByTag("title").get(0).text("I-GO电子收据");
Element title_chinese = document.getElementById("title_chinese");
title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，您在I-GO此订单消费GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
- Element xcf_chinese = document.getElementById("xcf_chinese");
- xcf_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element qbj_chinese = document.getElementById("qbj_chinese");
+ qbj_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getStartMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element scf_chinese = document.getElementById("scf_chinese");
+ if(null != orderPrivateCar.getDurationMoney() && orderPrivateCar.getDurationMoney() > 0){
+ scf_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getDurationMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element scf_chinese_div = document.getElementById("scf_chinese_div");
+ scf_chinese_div.remove();
+ }
+ Element lcf_chinese = document.getElementById("lcf_chinese");
+ if(null != orderPrivateCar.getMileageMoney() && orderPrivateCar.getMileageMoney() > 0){
+ lcf_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getMileageMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element lcf_chinese_div = document.getElementById("lcf_chinese_div");
+ lcf_chinese_div.remove();
+ }
+ Element ddf_chinese = document.getElementById("ddf_chinese");
+ if(null != orderPrivateCar.getWaitMoney() && orderPrivateCar.getWaitMoney() > 0){
+ ddf_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getWaitMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element ddf_chinese_div = document.getElementById("ddf_chinese_div");
+ ddf_chinese_div.remove();
+ }
+ Element glf_chinese = document.getElementById("glf_chinese");
+ if(null != orderPrivateCar.getRoadTollMoney() && orderPrivateCar.getRoadTollMoney() > 0){
+ glf_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getRoadTollMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element glf_chinese_div = document.getElementById("glf_chinese_div");
+ glf_chinese_div.remove();
+ }
+ Element tcf_chinese = document.getElementById("tcf_chinese");
+ if(null != orderPrivateCar.getParkMoney() && orderPrivateCar.getParkMoney() > 0){
+ tcf_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getParkMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element tcf_chinese_div = document.getElementById("tcf_chinese_div");
+ tcf_chinese_div.remove();
+ }
if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
Element yhq_chinese = document.getElementById("yhq_chinese");
yhq_chinese.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
@@ -2484,8 +2729,43 @@
document.getElementsByTag("title").get(0).text("Receipt");
Element title_english = document.getElementById("title_english");
title_english.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，You spent GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue() + " on the trip ");
- Element xcf_english = document.getElementById("xcf_english");
- xcf_english.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element qbj_english = document.getElementById("qbj_english");
+ qbj_english.text("GHS " + new BigDecimal(orderPrivateCar.getStartMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element scf_english = document.getElementById("scf_english");
+ if(null != orderPrivateCar.getDurationMoney() && orderPrivateCar.getDurationMoney() > 0){
+ scf_english.text("GHS " + new BigDecimal(orderPrivateCar.getDurationMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element scf_english_div = document.getElementById("scf_english_div");
+ scf_english_div.remove();
+ }
+ Element lcf_english = document.getElementById("lcf_english");
+ if(null != orderPrivateCar.getMileageMoney() && orderPrivateCar.getMileageMoney() > 0){
+ lcf_english.text("GHS " + new BigDecimal(orderPrivateCar.getMileageMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element lcf_english_div = document.getElementById("lcf_english_div");
+ lcf_english_div.remove();
+ }
+ Element ddf_english = document.getElementById("ddf_english");
+ if(null != orderPrivateCar.getWaitMoney() && orderPrivateCar.getWaitMoney() > 0){
+ ddf_english.text("GHS " + new BigDecimal(orderPrivateCar.getWaitMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element ddf_english_div = document.getElementById("ddf_english_div");
+ ddf_english_div.remove();
+ }
+ Element glf_english = document.getElementById("glf_english");
+ if(null != orderPrivateCar.getRoadTollMoney() && orderPrivateCar.getRoadTollMoney() > 0){
+ glf_english.text("GHS " + new BigDecimal(orderPrivateCar.getRoadTollMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element glf_english_div = document.getElementById("glf_english_div");
+ glf_english_div.remove();
+ }
+ Element tcf_english = document.getElementById("tcf_english");
+ if(null != orderPrivateCar.getParkMoney() && orderPrivateCar.getParkMoney() > 0){
+ tcf_english.text("GHS " + new BigDecimal(orderPrivateCar.getParkMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element tcf_english_div = document.getElementById("tcf_english_div");
+ tcf_english_div.remove();
+ }
if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
Element yhq_english = document.getElementById("yhq_english");
yhq_english.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
@@ -2550,8 +2830,43 @@
document.getElementsByTag("title").get(0).text("Reçu");
Element title_french = document.getElementById("title_french");
title_french.text("Le " + DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + ", vous avez dépensé GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue() + " sur le voyage");
- Element xcf_french = document.getElementById("xcf_french");
- xcf_french.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element qbj_french = document.getElementById("qbj_french");
+ qbj_french.text("GHS " + new BigDecimal(orderPrivateCar.getStartMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element scf_french = document.getElementById("scf_french");
+ if(null != orderPrivateCar.getDurationMoney() && orderPrivateCar.getDurationMoney() > 0){
+ scf_french.text("GHS " + new BigDecimal(orderPrivateCar.getDurationMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element scf_french_div = document.getElementById("scf_french_div");
+ scf_french_div.remove();
+ }
+ Element lcf_french = document.getElementById("lcf_french");
+ if(null != orderPrivateCar.getMileageMoney() && orderPrivateCar.getMileageMoney() > 0){
+ lcf_french.text("GHS " + new BigDecimal(orderPrivateCar.getMileageMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element lcf_french_div = document.getElementById("lcf_french_div");
+ lcf_french_div.remove();
+ }
+ Element ddf_french = document.getElementById("ddf_french");
+ if(null != orderPrivateCar.getWaitMoney() && orderPrivateCar.getWaitMoney() > 0){
+ ddf_french.text("GHS " + new BigDecimal(orderPrivateCar.getWaitMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element ddf_french_div = document.getElementById("ddf_french_div");
+ ddf_french_div.remove();
+ }
+ Element glf_french = document.getElementById("glf_french");
+ if(null != orderPrivateCar.getRoadTollMoney() && orderPrivateCar.getRoadTollMoney() > 0){
+ glf_french.text("GHS " + new BigDecimal(orderPrivateCar.getRoadTollMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element glf_french_div = document.getElementById("glf_french_div");
+ glf_french_div.remove();
+ }
+ Element tcf_french = document.getElementById("tcf_french");
+ if(null != orderPrivateCar.getParkMoney() && orderPrivateCar.getParkMoney() > 0){
+ tcf_french.text("GHS " + new BigDecimal(orderPrivateCar.getParkMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element tcf_french_div = document.getElementById("tcf_french_div");
+ tcf_french_div.remove();
+ }
if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
Element yhq_french = document.getElementById("yhq_french");
yhq_french.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
--
Gitblit v1.7.1