From 13d2bd6a27f941cfd8f096a7ae2def858a565363 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期三, 04 九月 2024 11:01:34 +0800
Subject: [PATCH] 修改2.0 bug

---
 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java |  634 ++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 354 insertions(+), 280 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 a72144f..e85c825 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
@@ -7,7 +7,6 @@
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.stylefeng.guns.core.util.ToolUtil;
 import com.stylefeng.guns.modular.crossCity.dao.OrderCrossCityMapper;
-import com.stylefeng.guns.modular.crossCity.model.OrderCrossCity;
 import com.stylefeng.guns.modular.crossCity.server.IOrderCrossCityService;
 import com.stylefeng.guns.modular.crossCity.server.impl.OrderCrossCityServiceImpl;
 import com.stylefeng.guns.modular.smallLogistics.model.OrderLogistics;
@@ -28,7 +27,6 @@
 import com.stylefeng.guns.modular.system.util.itextpdf.HtmlToPdfUtils;
 import com.stylefeng.guns.modular.system.warpper.BaseWarpper;
 import com.stylefeng.guns.modular.system.warpper.EndPushWarpper;
-import com.stylefeng.guns.modular.system.warpper.OrderInfoWarpper;
 import com.stylefeng.guns.modular.system.warpper.OrderServerWarpper;
 import com.stylefeng.guns.modular.taxi.dao.OrderTaxiMapper;
 import com.stylefeng.guns.modular.taxi.model.OrderTaxi;
@@ -39,7 +37,6 @@
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
-import org.jsoup.nodes.FormElement;
 import org.jsoup.select.Elements;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -88,92 +85,92 @@
     @Resource
     private RegionMapper regionMapper;
 
-    @Autowired
+    @Resource
     private DateUtil dateUtil;
 
-    @Autowired
+    @Resource
     private IUserInfoService userInfoService;
 
-    @Autowired
+    @Resource
     private IDriverService driverService;
 
-    @Autowired
+    @Resource
     private IDriverServiceService driverServiceService;
 
-    @Autowired
+    @Resource
     private PushUtil pushUtil;
 
-    @Autowired
+    @Resource
     private ICompanyCityService companyCityService;
 
-    @Autowired
+    @Resource
     private IPushOrderService pushOrderService;
 
-    @Autowired
+    @Resource
     private ISystemNoticeService systemNoticeService;
 
-    @Autowired
+    @Resource
     private ICancleOrderService cancleOrderService;
 
-    @Autowired
+    @Resource
     private IOrderCancelService orderCancelService;
 
-    @Autowired
+    @Resource
     private RestTemplate internalRestTemplate;
 
-    @Autowired
+    @Resource
     private IPaymentRecordService paymentRecordService;
 
-    @Autowired
+    @Resource
     private ITransactionDetailsService transactionDetailsService;
 
-    @Autowired
+    @Resource
     private ChinaMobileUtil chinaMobileUtil;
 
-    @Autowired
+    @Resource
     private IIncomeService incomeService;
 
-    @Autowired
+    @Resource
     private IUserCouponRecordService userCouponRecordService;
 
-    @Autowired
+    @Resource
     private IUserRedPacketRecordService userRedPacketRecordService;
 
-    @Autowired
+    @Resource
     private ICompanyService companyService;
 
-    @Autowired
+    @Resource
     private IUserActivityRedenvelopeService userActivityRedenvelopeService;
 
-    @Autowired
+    @Resource
     private RedisUtil redisUtil;
 
-    @Autowired
+    @Resource
     private IOrderPositionService orderPositionService;
 
-    @Autowired
+    @Resource
     private IOrderCrossCityService orderCrossCityService;
 
-    @Autowired
+    @Resource
     private IAssignOrderService assignOrderService;
 
     @Resource
     private CarMapper carMapper;
 
-    @Autowired
+    @Resource
     private IOrderEvaluateService orderEvaluateService;
 
-    @Autowired
+    @Resource
     private IOrderLogisticsService orderLogisticsService;
 
-    @Autowired
+    @Resource
     private IBankCardService bankCardService;
 
 
     @Value("${filePath}")
     private String filePath;
 
-    @Autowired
+    @Resource
     private IOrderTaxiService orderTaxiService;
 
     public static List<Integer> orderIds = new ArrayList<>();
@@ -184,32 +181,35 @@
     @Value("${spring.mail.template-path}")
     private String templatePath;
 
-    @Autowired
+    @Resource
     private ISettlementDetailService settlementDetailService;
 
-    @Autowired
+    @Resource
     private ISettlementRecordService settlementRecordService;
 
-    @Autowired
+    @Resource
     private ISettlementAllocationService settlementAllocationService;
 
-    @Autowired
+    @Resource
     private TEmailService emailService;
 
-    @Autowired
+    @Resource
     private IPhoneService phoneService;
     
-    @Autowired
+    @Resource
     private IRedEnvelopePaymentSettingsService redEnvelopePaymentSettingsService;
     
-    @Autowired
+    @Resource
     private FleetEngineUtil fleetEngineUtil;
     
     @Resource
     private CarModelMapper carModelMapper;
     
-    @Autowired
+    @Resource
     private ICarService carService;
+    
+    @Resource
+    private IDriverWorkService driverWorkService;
 
 
 
@@ -264,7 +264,8 @@
             baseWarpper.setId(orderPrivateCars.get(0).getId());
             return ResultUtil.success(baseWarpper);
         }
-
+    
+        String tripId = redisUtil.getValue("trip" + uid);
         startAddress = startAddress.replaceAll("& #40;", "(");
         startAddress = startAddress.replaceAll("& #41;", ")");
         endAddress = endAddress.replaceAll("& #40;", "(");
@@ -281,7 +282,7 @@
         orderPrivateCar.setPlacementLon(Double.valueOf(placementLon));
         orderPrivateCar.setPlacementLat(Double.valueOf(placementLat));
 
-        ReverseGeocodeVo reverseGeocode = GoogleMapUtil.getReverseGeocode(Double.valueOf(placementLat), Double.valueOf(placementLon));
+        ReverseGeocodeVo reverseGeocode = GoogleMapUtil.getReverseGeocode(Double.valueOf(placementLat), Double.valueOf(placementLon), tripId);
         orderPrivateCar.setPlacementAddress(reverseGeocode.getAddress());
         orderPrivateCar.setStartLon(Double.valueOf(startLon));
         orderPrivateCar.setStartLat(Double.valueOf(startLat));
@@ -346,7 +347,7 @@
                 String value = redisUtil.getValue("DRIVER" + driver.getId());
                 if(ToolUtil.isNotEmpty(value)) {
                     String[] split = value.split(",");
-                    DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(orderPrivateCar.getStartLat(), orderPrivateCar.getStartLon(), Double.valueOf(split[1]), Double.valueOf(split[0]));
+                    DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(orderPrivateCar.getStartLat(), orderPrivateCar.getStartLon(), Double.valueOf(split[1]), Double.valueOf(split[0]), tripId);
                     //超时时间
                     long timeOut = System.currentTimeMillis() + (distancematrix.getDuration() * 1000);
                     orderPrivateCar.setEstimateArriveTime(new Date(timeOut));
@@ -359,8 +360,8 @@
 
         orderPrivateCar.setIsReassign(1);
         orderPrivateCar.setIsDelete(1);
-        orderPrivateCar.setTripId(UUIDUtil.getRandomCode());
-        DistancematrixVo distancematrix1 = GoogleMapUtil.getDistancematrix(orderPrivateCar.getStartLat(), orderPrivateCar.getStartLon(), orderPrivateCar.getEndLat(), orderPrivateCar.getEndLon());
+        orderPrivateCar.setTripId(tripId);
+        DistancematrixVo distancematrix1 = GoogleMapUtil.getDistancematrix(orderPrivateCar.getStartLat(), orderPrivateCar.getStartLon(), orderPrivateCar.getEndLat(), orderPrivateCar.getEndLon(), tripId);
         Long distance1 = distancematrix1.getDistance();
         orderPrivateCar.setEstimatedMileage(new BigDecimal(distance1).divide(new BigDecimal(1000)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
         this.insert(orderPrivateCar);
@@ -371,7 +372,6 @@
     
         new Thread(() -> {
             try {
-                String vehicleId = null;
                 if(null != orderPrivateCar.getDriverId()){
                     Driver driver = driverService.selectById(orderPrivateCar.getDriverId());
                     Car car = carMapper.selectById(driver.getCarId());
@@ -379,6 +379,7 @@
                         car.setVehicleId(UUIDUtil.getRandomCode());
                         carMapper.updateById(car);
                     }
+                    String vehicleId = car.getVehicleId();
                     //查询车辆信息，没有则创建信息
                     String vehicles = fleetEngineUtil.getVehicles(car.getVehicleId());
                     if(ToolUtil.isEmpty(vehicles)){
@@ -386,10 +387,12 @@
                         fleetEngineUtil.createVehicles(carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
                         fleetEngineUtil.updateVehicles("ONLINE", carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
                     }
+    
+                    //创建行程数据
+                    fleetEngineUtil.createTrip(vehicleId, 1, orderPrivateCar.getTripId(),
+                            orderPrivateCar.getStartLat().toString(), orderPrivateCar.getStartLon().toString(), orderPrivateCar.getEndLat().toString(), orderPrivateCar.getEndLon().toString());
                 }
-                //创建行程数据
-                fleetEngineUtil.createTrip(vehicleId, 1, orderPrivateCar.getTripId(),
-                        orderPrivateCar.getStartLat().toString(), orderPrivateCar.getStartLon().toString(), orderPrivateCar.getEndLat().toString(), orderPrivateCar.getEndLon().toString());
+                
             }catch (Exception e){
                 e.printStackTrace();
             }
@@ -425,7 +428,7 @@
                 public void run() {
                     Process process = null;
                     try {
-                        process = Runtime.getRuntime().exec("rm -rf /usr/local/nginx/html/files/audio/" + fileName);
+                        process = Runtime.getRuntime().exec("sudo rm -rf /home/igotechgh/nginx/html/files/audio/" + fileName);
                     } catch (IOException e) {
                         throw new RuntimeException(e);
                     }
@@ -447,14 +450,14 @@
 
         // TODO: 2021/5/11 修改，根据后台设定的派单范围查询范围内有无司机，将单子指派给距离最近的司机（距离相同随机取），范围内没有司机再进行推单流程
         if(orderPrivateCar.getState() == 1){
-            Company query = companyCityService.query1(orderPrivateCar.getStartLon().toString(), orderPrivateCar.getStartLat().toString());
+            Company query = companyCityService.query1(uid, orderPrivateCar.getStartLon().toString(), orderPrivateCar.getStartLat().toString());
             if(null == query){
                 return ResultUtil.error(language == 1 ? "起点暂未企业提供服务" : language == 2 ? "Starting point no enterprise to provide services" : "Point de départ pas encore disponible pour les entreprises");
             }
             AssignOrder assignOrder = assignOrderService.selectOne(new EntityWrapper<AssignOrder>().eq("companyId", query.getId()).eq("type", 1));
             if(null != assignOrder && assignOrder.getPeople() > 0){//配置了指派规则才处理
                 //获取空闲司机
-                List<Driver> drivers = driverService.queryIdleDriver(1, orderPrivateCar.getServerCarModelId(), orderPrivateCar.getStartLon(), orderPrivateCar.getStartLat(), assignOrder.getDistance(), null);//获取范围内空闲司机
+                List<Driver> drivers = driverService.queryIdleDriver(orderPrivateCar.getUserId(), 1, orderPrivateCar.getServerCarModelId(), orderPrivateCar.getStartLon(), orderPrivateCar.getStartLat(), assignOrder.getDistance(), null);//获取范围内空闲司机
                 if(drivers.size() > 0){//有司机，直接指派给司机
                     Driver dr = null;
                     if(drivers.size() > 1){
@@ -467,7 +470,7 @@
                                 String value = redisUtil.getValue("DRIVER" + drivers.get(j).getId());
                                 if(null != value){
                                     String[] split = value.split(",");
-                                    DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(orderPrivateCar.getStartLat(), orderPrivateCar.getStartLon(), Double.valueOf(split[1]), Double.valueOf(split[0]));
+                                    DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(orderPrivateCar.getStartLat(), orderPrivateCar.getStartLon(), Double.valueOf(split[1]), Double.valueOf(split[0]), tripId);
                                     Long distance = distancematrix.getDistance();
                                     if((0 == m && null == driver) || (distance < m)){
                                         driver = drivers.get(j);
@@ -486,7 +489,7 @@
                             String value = redisUtil.getValue("DRIVER" + driver.getId());
                             if(null != value){
                                 String[] split = value.split(",");
-                                DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(orderPrivateCar.getStartLat(), orderPrivateCar.getStartLon(), Double.valueOf(split[1]), Double.valueOf(split[0]));
+                                DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(orderPrivateCar.getStartLat(), orderPrivateCar.getStartLon(), Double.valueOf(split[1]), Double.valueOf(split[0]), tripId);
                                 Long d = distancematrix.getDistance();
                                 if((0 == m && null == dr) || (d.intValue() < m.intValue())){
                                     dr = driver;
@@ -497,65 +500,70 @@
                     }else{
                         dr = drivers.get(0);
                     }
-
-                    orderPrivateCar.setDriverId(dr.getId());
-                    orderPrivateCar.setCompanyId(dr.getFranchiseeId() != null && dr.getFranchiseeId() != 0 ? dr.getFranchiseeId() : (
-                            dr.getCompanyId() != null && dr.getCompanyId() != 0 ? dr.getCompanyId() : 1));
-                    orderPrivateCar.setState(2);
-                    orderPrivateCar.setCarId(dr.getCarId());
-                    CarService query1 = carServiceMapper.query(1, dr.getCarId());
-                    orderPrivateCar.setServerCarModelId(query1.getServerCarModelId());
-                    orderPrivateCar.setSnatchOrderTime(new Date());
-
-                    dr.setState(3);
-                    driverService.updateById(dr);
-                    this.updateById(orderPrivateCar);
     
-                    Integer language1 = dr.getLanguage();
-                    String text = "";
-                    switch (language1){
-                        case 1:
-                            text = "收到新的打车订单，从" + orderPrivateCar.getStartAddress() + "出发，全程约" + orderPrivateCar.getEstimatedMileage() + "公里";
-                            break;
-                        case 2:
-                            text = "Received a new ride order, starting from " + orderPrivateCar.getStartAddress() + ", the whole journey is about " + orderPrivateCar.getEstimatedMileage() + "kilometre";
-                            break;
-                        case 3:
-                            text = "J'ai reçu une nouvelle commande de course, à partir de " + orderPrivateCar.getStartAddress() + ", le trajet complet est d’environ " + orderPrivateCar.getEstimatedMileage() + "kilométrage";
-                            break;
+                    Driver driver = driverService.selectById(dr.getId());
+                    DriverWork driverWork = driverWorkService.selectOne(new EntityWrapper<DriverWork>().eq("driverId", dr.getId())
+                            .eq("state", 1).like("type", "1"));
+                    if(driver.getState() == 2 && null != driverWork){
+                        orderPrivateCar.setDriverId(dr.getId());
+                        orderPrivateCar.setCompanyId(dr.getFranchiseeId() != null && dr.getFranchiseeId() != 0 ? dr.getFranchiseeId() : (
+                                dr.getCompanyId() != null && dr.getCompanyId() != 0 ? dr.getCompanyId() : 1));
+                        orderPrivateCar.setState(2);
+                        orderPrivateCar.setCarId(dr.getCarId());
+                        CarService query1 = carServiceMapper.query(1, dr.getCarId());
+                        orderPrivateCar.setServerCarModelId(query1.getServerCarModelId());
+                        orderPrivateCar.setSnatchOrderTime(new Date());
+    
+                        dr.setState(3);
+                        driverService.updateById(dr);
+                        this.updateById(orderPrivateCar);
+    
+                        Integer language1 = dr.getLanguage();
+                        String text = "";
+                        switch (language1){
+                            case 1:
+                                text = "收到新的打车订单，从" + orderPrivateCar.getStartAddress() + "出发，全程约" + orderPrivateCar.getEstimatedMileage() + "公里";
+                                break;
+                            case 2:
+                                text = "Received a new ride order, starting from " + orderPrivateCar.getStartAddress() + ", the whole journey is about " + orderPrivateCar.getEstimatedMileage() + "kilometre";
+                                break;
+                            case 3:
+                                text = "J'ai reçu une nouvelle commande de course, à partir de " + orderPrivateCar.getStartAddress() + ", le trajet complet est d’environ " + orderPrivateCar.getEstimatedMileage() + "kilométrage";
+                                break;
         
-                    }
-                    String audioUrl = "";
-                    String fileName = "pushOrder" + orderPrivateCar.getDriverId() + UUIDUtil.getRandomCode(5) + ".mp3";
-                    try {
-                        audioUrl = TextToSpeechUtil.create(language1 == 1 ? "cmn-CN" : language1 == 2 ? "en-US" : "fr-FR", text, fileName);
-                    } catch (Exception e) {
-                        throw new RuntimeException(e);
-                    }
-                    //定时任务删除语音文件
-                    new Timer().schedule(new TimerTask() {
-                        @Override
-                        public void run() {
-                            Process process = null;
-                            try {
-                                process = Runtime.getRuntime().exec("rm -rf /usr/local/nginx/html/files/audio/" + fileName);
-                            } catch (IOException e) {
-                                throw new RuntimeException(e);
-                            }
-                            if (process != null) {
-                                process.destroy();
-                            }
                         }
-                    }, 30000);
+                        String audioUrl = "";
+                        String fileName = "pushOrder" + orderPrivateCar.getDriverId() + UUIDUtil.getRandomCode(5) + ".mp3";
+                        try {
+                            audioUrl = TextToSpeechUtil.create(language1 == 1 ? "cmn-CN" : language1 == 2 ? "en-US" : "fr-FR", text, fileName);
+                        } catch (Exception e) {
+                            throw new RuntimeException(e);
+                        }
+                        //定时任务删除语音文件
+                        new Timer().schedule(new TimerTask() {
+                            @Override
+                            public void run() {
+                                Process process = null;
+                                try {
+                                    process = Runtime.getRuntime().exec("sudo rm -rf /home/igotechgh/nginx/html/files/audio/" + fileName);
+                                } catch (IOException e) {
+                                    throw new RuntimeException(e);
+                                }
+                                if (process != null) {
+                                    process.destroy();
+                                }
+                            }
+                        }, 30000);
     
-                    String finalAudioUrl = audioUrl;
-                    new Thread(new Runnable() {
-                        @Override
-                        public void run() {
-                            pushUtil.pushOrderState(1, uid, orderPrivateCar.getId(), 1, 2, 0, "");
-                            pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, 2, 0, finalAudioUrl);
-                        }
-                    }).start();
+                        String finalAudioUrl = audioUrl;
+                        new Thread(new Runnable() {
+                            @Override
+                            public void run() {
+                                pushUtil.pushOrderState(1, uid, orderPrivateCar.getId(), 1, 2, 0, "");
+                                pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, 2, 0, finalAudioUrl);
+                            }
+                        }).start();
+                    }
                 }
             }
         }
@@ -564,22 +572,6 @@
         //推单操作
         if(orderPrivateCar.getState() == 1){
             this.pushOrder(orderPrivateCar);
-        }else{
-//            //接单后定时任务判断司机是否去接乘客，没有则推送提醒
-//            CancleOrder cancleOrder = cancleOrderService.query(orderPrivateCar.getCompanyId());
-//            if(null != cancleOrder){
-//                JSONObject object = JSON.parseObject(cancleOrder.getContent());
-//                long time = object.getInteger("driverTimeout") * 60000L;
-//                new Timer().schedule(new TimerTask() {
-//                    @Override
-//                    public void run() {
-//                        OrderPrivateCar orderPrivateCar1 = OrderPrivateCarServiceImpl.this.selectById(orderPrivateCar.getId());
-//                        if(orderPrivateCar1.getState() == 2){
-//                            pushUtil.pushDriverTimeOut(1, orderPrivateCar1.getUserId(), orderPrivateCar1.getId(), 1);
-//                        }
-//                    }
-//                }, time);
-//            }
         }
 
 
@@ -749,7 +741,7 @@
         if(null == orderPrivateCar){
             return ResultUtil.error(language == 1 ? "取消订单失败，订单信息有误" : language == 2 ? "Failed to cancel order, order-information error." : "Échec de l’annulation de la commande, erreur d’information de commande.");
         }
-        if(orderPrivateCar.getState() > 5 && orderPrivateCar.getState() != 12){
+        if(orderPrivateCar.getState() > 5 && orderPrivateCar.getState() != 11 && orderPrivateCar.getState() != 12){
             return ResultUtil.error(language == 1 ? "取消订单失败，不合法的操作" : language == 2 ? "Failed to cancel order, illegal operation." : "Échec de l’annulation de la commande, opération illégale.");
         }
         
@@ -816,23 +808,23 @@
                     switch (language1){
                         case 1:
                             if(orderPrivateCar.getState() == 6){
-                                audioUrl = "http://182.160.16.251:81/files/audio/system/MidwayCancellation-CN.mp3";
+                                audioUrl = "https://igo.i-go.group/files/audio/system/MidwayCancellation-CN.mp3";
                             }else{
-                                audioUrl = "http://182.160.16.251:81/files/audio/system/UserCancelledOrder-CN.mp3";
+                                audioUrl = "https://igo.i-go.group/files/audio/system/UserCancelledOrder-CN.mp3";
                             }
                             break;
                         case 2:
                             if(orderPrivateCar.getState() == 6){
-                                audioUrl = "http://182.160.16.251:81/files/audio/system/MidwayCancellation-EN.mp3";
+                                audioUrl = "https://igo.i-go.group/files/audio/system/MidwayCancellation-EN.mp3";
                             }else{
-                                audioUrl = "http://182.160.16.251:81/files/audio/system/UserCancelledOrder-EN.mp3";
+                                audioUrl = "https://igo.i-go.group/files/audio/system/UserCancelledOrder-EN.mp3";
                             }
                             break;
                         case 3:
                             if(orderPrivateCar.getState() == 6){
-                                audioUrl = "http://182.160.16.251:81/files/audio/system/MidwayCancellation-FR.mp3";
+                                audioUrl = "https://igo.i-go.group/files/audio/system/MidwayCancellation-FR.mp3";
                             }else{
-                                audioUrl = "http://182.160.16.251:81/files/audio/system/UserCancelledOrder-FR.mp3";
+                                audioUrl = "https://igo.i-go.group/files/audio/system/UserCancelledOrder-FR.mp3";
                             }
                             break;
                     }
@@ -848,7 +840,7 @@
         }
         
         //修改行程信息
-        if(orderPrivateCar.getState() == 10 || orderPrivateCar.getState() == 12){
+        if((orderPrivateCar.getState() == 10 || orderPrivateCar.getState() == 12) && null != orderPrivateCar.getDriverId()){
             fleetEngineUtil.updateTrip("CANCELED", null, null, orderPrivateCar.getTripId(), null, null, null, null);
         }
         
@@ -907,8 +899,8 @@
                 checkoutRequest.setRequestDescription("Cancel a trip");
                 checkoutRequest.setCallbackUrl(callbackPath + "/base/wxCancelOrderTaxi");
                 checkoutRequest.setPendingRedirectUrl("");
-                checkoutRequest.setSuccessRedirectUrl("http://182.160.16.251:81/payMoney/pages/success.html");
-                checkoutRequest.setFailRedirectUrl("http://182.160.16.251:81/payMoney/pages/fail.html");
+                checkoutRequest.setSuccessRedirectUrl("https://igo.i-go.group/payMoney/pages/success.html");
+                checkoutRequest.setFailRedirectUrl("https://igo.i-go.group/payMoney/pages/fail.html");
                 resultUtil = TinggPayUtil.checkoutRequest(checkoutRequest);
                 if(resultUtil.getCode()==200){
                     paymentRecordService.saveData(1, null, null, id, 1, 1, amount, null, 1);//添加预支付数据
@@ -932,8 +924,8 @@
                 checkoutRequest.setRequestDescription("Cancel a trip");
                 checkoutRequest.setCallbackUrl(callbackPath + "/base/wxCancelOrderTaxi");
                 checkoutRequest.setPendingRedirectUrl("");
-                checkoutRequest.setSuccessRedirectUrl("http://182.160.16.251:81/payMoney/pages/success.html");
-                checkoutRequest.setFailRedirectUrl("http://182.160.16.251:81/payMoney/pages/fail.html");
+                checkoutRequest.setSuccessRedirectUrl("https://igo.i-go.group/payMoney/pages/success.html");
+                checkoutRequest.setFailRedirectUrl("https://igo.i-go.group/payMoney/pages/fail.html");
                 resultUtil = TinggPayUtil.checkoutRequest(checkoutRequest);
                 if(resultUtil.getCode()==200){
                     paymentRecordService.saveData(1, null, null, id, 1, 2, amount, null, 1);//添加预支付数据
@@ -1025,12 +1017,12 @@
                     if(ToolUtil.isNotEmpty(vehicle)){
                         integers = JSON.parseArray(vehicle).toJavaList(Integer.class);
                     }
-                    Company query = companyCityService.query1(String.valueOf(orderPrivateCar.getStartLon()), String.valueOf(orderPrivateCar.getStartLat()));//获取起点所属分公司
+                    Company query = companyCityService.query1(orderPrivateCar.getUserId(), String.valueOf(orderPrivateCar.getStartLon()), String.valueOf(orderPrivateCar.getStartLat()));//获取起点所属分公司
                     List<PushOrder> querys = pushOrderService.querys(null, 1, query.getId());//获取需要推送的次数
                     for(int i = 1; i <= querys.size(); i++){
                         PushOrder pushOrder = pushOrderService.querys(i, 1, query.getId()).get(0);
                         //获取空闲司机
-                        List<Driver> list = driverService.queryIdleDriver(1, orderPrivateCar.getServerCarModelId(), orderPrivateCar.getStartLon(), orderPrivateCar.getStartLat(), pushOrder.getPushDistance(), null);//所有附近空闲司机
+                        List<Driver> list = driverService.queryIdleDriver(orderPrivateCar.getUserId(), 1, orderPrivateCar.getServerCarModelId(), orderPrivateCar.getStartLon(), orderPrivateCar.getStartLat(), pushOrder.getPushDistance(), null);//所有附近空闲司机
                         System.err.println("【" + orderPrivateCar.getId() + "】空闲司机：" + JSON.toJSONString(list));
                         if(list.size() > 0){
                             double driverProportion = pushOrder.getDriverProportion() / 100;//推送占比计算成小数
@@ -1045,6 +1037,13 @@
                                     }
                                 }
                                 if(bo){
+                                    continue;
+                                }
+    
+                                Driver driver1 = driverService.selectById(driver.getId());
+                                DriverWork driverWork = driverWorkService.selectOne(new EntityWrapper<DriverWork>().eq("driverId", driver1.getId())
+                                        .eq("state", 1).like("type", "1"));
+                                if(driver1.getState() != 2 || null == driverWork){
                                     continue;
                                 }
     
@@ -1075,7 +1074,7 @@
                                     public void run() {
                                         Process process = null;
                                         try {
-                                            process = Runtime.getRuntime().exec("rm -rf /usr/local/nginx/html/files/audio/" + fileName);
+                                            process = Runtime.getRuntime().exec("sudo rm -rf /home/igotechgh/nginx/html/files/audio/" + fileName);
                                         } catch (IOException e) {
                                             throw new RuntimeException(e);
                                         }
@@ -1192,7 +1191,7 @@
             return ResultUtil.error(language == 1 ? "订单不在待支付状态，不允许支付" : language == 2 ? "The order is no longer with Pending Payment, making payments is not allowed." : "La commande n’est plus en attente de paiement, il n’est pas permis d’effectuer des paiements.", "");
         }
         Integer uid = orderPrivateCar.getUserId();
-        Double orderMoney = orderPrivateCar.getOrderMoney();
+        BigDecimal orderMoney = new BigDecimal(orderPrivateCar.getOrderMoney());
         UserInfo userInfo = userInfoService.selectById(uid);
         ResultUtil resultUtil = ResultUtil.success("");
         orderPrivateCar.setCouponMoney(0D);//初始化历史数据
@@ -1206,9 +1205,9 @@
                 Double special = query2.getSpecial();
                 if(null != special){
                     orderPrivateCar.setDiscount(special);
-                    double v = new BigDecimal(orderMoney).multiply(new BigDecimal(special / 10)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
+                    BigDecimal v = orderMoney.multiply(new BigDecimal(special / 10)).setScale(2, RoundingMode.HALF_EVEN);
                     if(orderMoney.compareTo(v) > 0){
-                        orderPrivateCar.setDiscountMoney(orderMoney - v);
+                        orderPrivateCar.setDiscountMoney(orderMoney.subtract(v).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
                         orderPrivateCar.setActivityId(query2.getId());
                         orderMoney = v;
                     }
@@ -1235,14 +1234,13 @@
             if(userCouponRecord.getCouponUseType() != 0 && userCouponRecord.getCouponUseType() != 1){
                 return ResultUtil.error(language == 1 ? "优惠券不能用于此订单" : language == 2 ? "Coupon cannot be used for this order." : "Le coupon ne peut pas être utilisé pour cette commande.", "");
             }
-            if(userCouponRecord.getCouponType() == 2 && orderMoney.compareTo(userCouponRecord.getFullMoney()) < 0){
+            if(userCouponRecord.getCouponType() == 2 && orderMoney.compareTo(new BigDecimal(userCouponRecord.getFullMoney())) < 0){
                 return ResultUtil.error(language == 1 ? "优惠券不能用于此订单" : language == 2 ? "Coupon cannot be used for this order." : "Le coupon ne peut pas être utilisé pour cette commande.", "");
             }
-            orderMoney = orderMoney - userCouponRecord.getMoney();
+            orderMoney = orderMoney.subtract(new BigDecimal(userCouponRecord.getMoney())).setScale(2, RoundingMode.HALF_EVEN);
             orderPrivateCar.setCouponMoney(userCouponRecord.getMoney());
             orderPrivateCar.setCouponId(couponId);
         }
-        orderMoney=new BigDecimal(orderMoney).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
 
         //计算红包
         if(null != redDeduction && 1 == redDeduction && null == orderPrivateCar.getRedPacketId()){
@@ -1253,14 +1251,17 @@
                         .eq("state", 1).eq("companyId", orderPrivateCar.getCompanyId()).gt("remainingAmount", 0).orderBy("insertTime", false));
     
                 BigDecimal deductionRatio = redEnvelopePaymentSettings.getDeductionRatio();
-                BigDecimal multiply1 = new BigDecimal(orderMoney).multiply(deductionRatio.divide(new BigDecimal(100))).setScale(2, RoundingMode.HALF_EVEN);
-                if(total.compareTo(multiply1.doubleValue()) >= 0){
+                BigDecimal multiply1 = orderMoney.multiply(deductionRatio.divide(new BigDecimal(100))).setScale(2, RoundingMode.HALF_EVEN);
+                if(total > 0 && multiply1.doubleValue() > 0 && total.compareTo(multiply1.doubleValue()) >= 0){
                     orderPrivateCar.setRedPacketMoney(multiply1.doubleValue());
-                    orderMoney = orderMoney - multiply1.doubleValue();
+                    orderMoney = orderMoney.subtract(multiply1).setScale(2, RoundingMode.HALF_EVEN);
                     
                     //获取红包id
                     JSONArray jsonArray = new JSONArray();
                     for (UserRedPacketRecord userRedPacketRecord : userRedPacketRecords) {
+                        if(multiply1.compareTo(BigDecimal.ZERO) == 0){
+                            break;
+                        }
                         JSONObject jsonObject = new JSONObject();
                         jsonObject.put("id", userRedPacketRecord.getId());
                         BigDecimal remainingAmount = new BigDecimal(userRedPacketRecord.getRemainingAmount());
@@ -1271,41 +1272,35 @@
                             multiply1 = multiply1.subtract(remainingAmount).setScale(2, RoundingMode.HALF_EVEN);
                             jsonObject.put("money", remainingAmount);
                             jsonArray.add(jsonObject);
-                            userRedPacketRecordService.updateById(userRedPacketRecord);
-                        }else{
+                        }else if(remainingAmount.compareTo(multiply1) > 0){
                             userRedPacketRecord.setRemainingAmount(remainingAmount.subtract(multiply1).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
                             jsonObject.put("money", multiply1);
                             jsonArray.add(jsonObject);
-                            userRedPacketRecordService.updateById(userRedPacketRecord);
-                            break;
+                            multiply1 = BigDecimal.ZERO;
                         }
                     }
+                    if(userRedPacketRecords.size() > 0){
+                        userRedPacketRecordService.updateBatchById(userRedPacketRecords);
+                    }
                     orderPrivateCar.setRedPacketId(jsonArray.toJSONString());
-                }else{
+                }
+                if(total > 0 && total.compareTo(multiply1.doubleValue()) < 0){
                     orderPrivateCar.setRedPacketMoney(total);
-                    orderMoney = orderMoney - total;
+                    orderMoney = orderMoney.subtract(new BigDecimal(total)).setScale(2, RoundingMode.HALF_EVEN);
                     //获取红包id
                     JSONArray jsonArray = new JSONArray();
-                    BigDecimal multiply = new BigDecimal(total);
                     for (UserRedPacketRecord userRedPacketRecord : userRedPacketRecords) {
                         JSONObject jsonObject = new JSONObject();
                         jsonObject.put("id", userRedPacketRecord.getId());
-                        BigDecimal remainingAmount = new BigDecimal(userRedPacketRecord.getRemainingAmount());
-                        if(multiply.compareTo(remainingAmount) >= 0){
-                            userRedPacketRecord.setRemainingAmount(0D);
-                            userRedPacketRecord.setEndTime(new Date());
-                            userRedPacketRecord.setState(2);
-                            multiply = multiply.subtract(remainingAmount).setScale(2, RoundingMode.HALF_EVEN);
-                            jsonObject.put("money", remainingAmount);
-                            jsonArray.add(jsonObject);
-                            userRedPacketRecordService.updateById(userRedPacketRecord);
-                        }else{
-                            userRedPacketRecord.setRemainingAmount(remainingAmount.subtract(multiply).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
-                            jsonObject.put("money", multiply);
-                            jsonArray.add(jsonObject);
-                            userRedPacketRecordService.updateById(userRedPacketRecord);
-                            break;
-                        }
+                        jsonObject.put("money", userRedPacketRecord.getRemainingAmount());
+                        jsonArray.add(jsonObject);
+    
+                        userRedPacketRecord.setRemainingAmount(0D);
+                        userRedPacketRecord.setEndTime(new Date());
+                        userRedPacketRecord.setState(2);
+                    }
+                    if(userRedPacketRecords.size() > 0){
+                        userRedPacketRecordService.updateBatchById(userRedPacketRecords);
                     }
                     orderPrivateCar.setRedPacketId(jsonArray.toJSONString());
                 }
@@ -1322,17 +1317,18 @@
             checkoutRequest.setAccountNumber(userInfo.getPhone());
             checkoutRequest.setCustomerFirstName(userInfo.getFirstName());
             checkoutRequest.setCustomerLastName(userInfo.getLastName());
-            checkoutRequest.setRequestAmount(orderMoney);
+            checkoutRequest.setRequestAmount(orderMoney.setScale(2, RoundingMode.HALF_EVEN).doubleValue());
             checkoutRequest.setMerchantTransactionId(merchantTransactionId);
             checkoutRequest.setRequestDescription("Travel completion payment");
             checkoutRequest.setCallbackUrl(callbackPath + "/base/wxPayOrderTaxi");
             checkoutRequest.setPendingRedirectUrl("");
-            checkoutRequest.setSuccessRedirectUrl("http://182.160.16.251:81/payMoney/pages/success.html");
-            checkoutRequest.setFailRedirectUrl("http://182.160.16.251:81/payMoney/pages/fail.html");
+            checkoutRequest.setSuccessRedirectUrl("https://igo.i-go.group/payMoney/pages/success.html");
+            checkoutRequest.setFailRedirectUrl("https://igo.i-go.group/payMoney/pages/fail.html");
             resultUtil = TinggPayUtil.checkoutRequest(checkoutRequest);
 
             if(resultUtil.getCode()==200){
-                paymentRecordService.saveData(1, null, null, orderId, 1, 1, orderMoney, null, 1);//添加预支付数据
+                paymentRecordService.saveData(1, null, null, orderId, 1, 1,
+                        orderMoney.setScale(2, RoundingMode.HALF_EVEN).doubleValue(), null, 1);//添加预支付数据
             }else{
                 resultUtil = ResultUtil.error(language == 1 ? "支付失败" : language == 2 ? "Payment failure" : "Paiement échoué", "");
             }
@@ -1348,38 +1344,40 @@
             checkoutRequest.setAccountNumber(bankCard.getCode());
             checkoutRequest.setCustomerFirstName(bankCard.getFirstName());
             checkoutRequest.setCustomerLastName(bankCard.getLastName());
-            checkoutRequest.setRequestAmount(orderMoney);
+            checkoutRequest.setRequestAmount(orderMoney.setScale(2, RoundingMode.HALF_EVEN).doubleValue());
             checkoutRequest.setMerchantTransactionId(merchantTransactionId);
             checkoutRequest.setRequestDescription("Travel completion payment");
             checkoutRequest.setCallbackUrl(callbackPath + "/base/wxPayOrderTaxi");
             checkoutRequest.setPendingRedirectUrl("");
-            checkoutRequest.setSuccessRedirectUrl("http://182.160.16.251:81/payMoney/pages/success.html");
-            checkoutRequest.setFailRedirectUrl("http://182.160.16.251:81/payMoney/pages/fail.html");
+            checkoutRequest.setSuccessRedirectUrl("https://igo.i-go.group/payMoney/pages/success.html");
+            checkoutRequest.setFailRedirectUrl("https://igo.i-go.group/payMoney/pages/fail.html");
             resultUtil = TinggPayUtil.checkoutRequest(checkoutRequest);
 
             if(resultUtil.getCode()==200){
-                paymentRecordService.saveData(1, null, null, orderId, 1, 2, orderMoney, null, 1);//添加预支付数据
+                paymentRecordService.saveData(1, null, null, orderId, 1, 2,
+                        orderMoney.setScale(2, RoundingMode.HALF_EVEN).doubleValue(), null, 1);//添加预支付数据
             }else{
                 resultUtil = ResultUtil.error(language == 1 ? "支付失败" : language == 2 ? "Payment failure" : "Paiement échoué", "");
             }
         }
         if(payType == 3){//余额支付
-            if(userInfo.getBalance() == null || userInfo.getBalance() < orderMoney){
+            if(userInfo.getBalance() == null || new BigDecimal(userInfo.getBalance()).compareTo(orderMoney) < 0){
                 return ResultUtil.error(language == 1 ? "账户余额不足" : language == 2 ? "Insufficient balance" : "Solde insuffisant", "");
             }
 
-            userInfo.setBalance(new BigDecimal(userInfo.getBalance()).subtract(new BigDecimal(orderMoney)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+            userInfo.setBalance(new BigDecimal(userInfo.getBalance()).subtract(orderMoney).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
 
             SysIntegral query1 = sysIntegralMapper.query(orderPrivateCar.getCompanyId());
             userInfo.setIntegral(userInfo.getIntegral() + (orderMoney.intValue() * query1.getIntegral()));//积分
 
             //添加交易明细
-            transactionDetailsService.saveData(uid, "完成订单", orderMoney, 2, 1, 1, 1, orderId);
+            transactionDetailsService.saveData(uid, "完成订单", orderMoney.setScale(2, RoundingMode.HALF_EVEN).doubleValue(),
+                    2, 1, 1, 1, orderId);
             userInfoService.updateById(userInfo);
 
             orderPrivateCar.setState(8);
             orderPrivateCar.setPayType(3);
-            orderPrivateCar.setPayMoney(orderMoney);
+            orderPrivateCar.setPayMoney(orderMoney.setScale(2, RoundingMode.HALF_EVEN).doubleValue());
             
             //处理优惠券和红包
             if(null != userCouponRecord){
@@ -1428,11 +1426,11 @@
                             if(null != orderPrivateCar.getDriverId()){
                                 aDouble = orderEvaluateService.queryDriverScore(orderPrivateCar.getDriverId());
                             }
-                            Double aDouble1 = Double.valueOf(orderPrivateCar.getMileage() / 1000);
+                            Double aDouble1 = new BigDecimal(orderPrivateCar.getMileage()).divide(new BigDecimal(1000)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
                             if(1 == language){
                                 document.getElementById("english").remove();
                                 document.getElementById("french").remove();
-                                document.getElementsByTag("title").get(0).text("I-GO电子收据");
+                                document.getElementsByTag("title").get(0).text("打车收据");
                                 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 qbj_chinese = document.getElementById("qbj_chinese");
@@ -1499,12 +1497,18 @@
                                 pay_type_chinese.text("余额支付");
                                 Element pay_money_chinese = document.getElementById("pay_money_chinese");
                                 pay_money_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+                                Element dispute_chinese = document.getElementById("dispute_chinese");
+                                if(null != orderPrivateCar.getIsDispute() && orderPrivateCar.getIsDispute() == 1){
+                                    dispute_chinese.text("（注意: 争议订单，经过三方协商，平台最终定价为 GHS" + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN) + "）");
+                                }else{
+                                    dispute_chinese.remove();
+                                }
                                 Element pdf_chinese = document.getElementById("pdf_chinese");
-                                pdf_chinese.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=1");
+                                pdf_chinese.attr("href", "https://igo.i-go.group/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=1");
                                 Element lost_item_chinese = document.getElementById("lost_item_chinese");
-                                lost_item_chinese.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=1");
+                                lost_item_chinese.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=1");
                                 Element track_chinese = document.getElementById("track_chinese");
-                                track_chinese.attr("href", "http://182.160.16.251:81/mailbox/user/location.html?orderId=" + orderId);
+                                track_chinese.attr("href", "https://igo.i-go.group/mailbox/user/location.html?orderId=" + orderId);
                                 Element pay_time_chinese = document.getElementById("pay_time_chinese");
                                 pay_time_chinese.text(DateUtil.conversionFormat(language, sdf1.format(orderPrivateCar.getEndServiceTime())));
                                 Elements driver_chinese = document.getElementsByClass("driver_chinese");
@@ -1533,7 +1537,7 @@
                             if(2 == language){
                                 document.getElementById("chinese").remove();
                                 document.getElementById("french").remove();
-                                document.getElementsByTag("title").get(0).text("Receipt");
+                                document.getElementsByTag("title").get(0).text("Ride 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 qbj_english = document.getElementById("qbj_english");
@@ -1600,12 +1604,18 @@
                                 pay_type_english.text("I-GO Wallet");
                                 Element pay_money_english = document.getElementById("pay_money_english");
                                 pay_money_english.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+                                Element dispute_english = document.getElementById("dispute_english");
+                                if(null != orderPrivateCar.getIsDispute() && orderPrivateCar.getIsDispute() == 1){
+                                    dispute_english.text("（Note: Disputed order, after tripartite negotiation, the final pricing of the platform is GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN) + "）");
+                                }else{
+                                    dispute_english.remove();
+                                }
                                 Element pdf_english = document.getElementById("pdf_english");
-                                pdf_english.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=1");
+                                pdf_english.attr("href", "https://igo.i-go.group/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=1");
                                 Element lost_item_english = document.getElementById("lost_item_english");
-                                lost_item_english.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=1");
+                                lost_item_english.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=1");
                                 Element track_english = document.getElementById("track_english");
-                                track_english.attr("href", "http://182.160.16.251:81/mailbox/user/location.html?orderId=" + orderId);
+                                track_english.attr("href", "https://igo.i-go.group/mailbox/user/location.html?orderId=" + orderId);
                                 Element pay_time_english = document.getElementById("pay_time_english");
                                 pay_time_english.text(DateUtil.conversionFormat(language, sdf1.format(orderPrivateCar.getEndServiceTime())));
                                 Elements driver_english = document.getElementsByClass("driver_english");
@@ -1634,7 +1644,7 @@
                             if(3 == language){
                                 document.getElementById("chinese").remove();
                                 document.getElementById("english").remove();
-                                document.getElementsByTag("title").get(0).text("Reçu");
+                                document.getElementsByTag("title").get(0).text("Reçu de course");
                                 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 qbj_french = document.getElementById("qbj_french");
@@ -1701,12 +1711,18 @@
                                 pay_type_french.text("Portefeuille I-GO");
                                 Element pay_money_french = document.getElementById("pay_money_french");
                                 pay_money_french.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+                                Element dispute_french = document.getElementById("dispute_french");
+                                if(null != orderPrivateCar.getIsDispute() && orderPrivateCar.getIsDispute() == 1){
+                                    dispute_french.text("（Remarque: Il s’agit d’une commande contestée, et après des négociations entre trois parties, la plateforme l’a finalement tarifée à GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN) + "）");
+                                }else{
+                                    dispute_french.remove();
+                                }
                                 Element pdf_french = document.getElementById("pdf_french");
-                                pdf_french.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=1");
+                                pdf_french.attr("href", "https://igo.i-go.group/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=1");
                                 Element lost_item_french = document.getElementById("lost_item_french");
-                                lost_item_french.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=1");
+                                lost_item_french.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=1");
                                 Element track_french = document.getElementById("track_french");
-                                track_french.attr("href", "http://182.160.16.251:81/mailbox/user/location.html?orderId=" + orderId);
+                                track_french.attr("href", "https://igo.i-go.group/mailbox/user/location.html?orderId=" + orderId);
                                 Element pay_time_french = document.getElementById("pay_time_french");
                                 pay_time_french.text(DateUtil.conversionFormat(language, sdf1.format(orderPrivateCar.getEndServiceTime())));
                                 Elements driver_french = document.getElementsByClass("driver_french");
@@ -1732,14 +1748,14 @@
                                 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 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu",  document.html());
+                            EmailUtil.send(userInfo.getEmail(), language == 1 ? "打车收据" : language == 2 ? "Ride receipt" : "Reçu de course",  document.html());
 
                             //开始生成pdf收据和html收据
-                            File file = new File("/usr/local/nginx/html/files/html/");
+                            File file = new File("/home/igotechgh/nginx/html/files/html/");
                             if(!file.exists()){
                                 file.mkdirs();
                             }
-                            file = new File("/usr/local/nginx/html/files/html/ride_receipt_" + orderId + ".html");
+                            file = new File("/home/igotechgh/nginx/html/files/html/ride_receipt_" + orderId + ".html");
                             if(!file.exists()){
                                 file.createNewFile();
                             }
@@ -1748,27 +1764,27 @@
                             fileWriter.flush();
                             fileWriter.close();
 
-                            File file1 = new File("/usr/local/nginx/html/files/pdf/");
+                            File file1 = new File("/home/igotechgh/nginx/html/files/pdf/");
                             if(!file1.exists()){
                                 file1.mkdirs();
                             }
-                            file1 = new File("/usr/local/nginx/html/files/pdf/ride_receipt_" + orderId + ".pdf");
+                            file1 = new File("/home/igotechgh/nginx/html/files/pdf/ride_receipt_" + orderId + ".pdf");
                             if(!file1.exists()){
                                 file1.createNewFile();
                             }
                             try {
                                 FileOutputStream fileOutputStream = new FileOutputStream(file1);
-                                HtmlToPdfUtils.convertToPdf("/usr/local/nginx/html/files/html/ride_receipt_" + orderId + ".html", "I-GO", fileOutputStream);
+                                HtmlToPdfUtils.convertToPdf("/home/igotechgh/nginx/html/files/html/ride_receipt_" + orderId + ".html", "I-GO", fileOutputStream);
                             }catch (Exception e){
                                 e.printStackTrace();
                                 System.out.println("html转pdf异常");
                             }
 
-                            String link ="http://182.160.16.251:81/files/html/ride_receipt_" + orderId + ".html";
+                            String link ="https://igo.i-go.group/files/html/ride_receipt_" + orderId + ".html";
                             TEmail tEmail = new TEmail();
                             tEmail.setLink(link);
                             tEmail.setUserId(uid);
-                            tEmail.setName(language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu");
+                            tEmail.setName(language == 1 ? "打车收据" : language == 2 ? "Ride receipt" : "Reçu de course");
                             tEmail.setType(1);
                             tEmail.setOrderId(orderId);
                             tEmail.setCreateTime(new Date());
@@ -1813,13 +1829,14 @@
             userInfo.setIntegral(userInfo.getIntegral() + (orderMoney.intValue() * query1.getIntegral()));//积分
 
             //添加交易明细
-            transactionDetailsService.saveData(uid, "完成订单", orderMoney, 2, 1, 1, 1, orderId);
+            transactionDetailsService.saveData(uid, "完成订单", orderMoney.setScale(2, RoundingMode.HALF_EVEN).doubleValue(),
+                    2, 1, 1, 1, orderId);
             userInfoService.updateById(userInfo);
 
             orderPrivateCar.setState(8);
             orderPrivateCar.setPayType(4);
             orderPrivateCar.setDriverPay(2);
-            orderPrivateCar.setPayMoney(orderMoney);
+            orderPrivateCar.setPayMoney(orderMoney.setScale(2, RoundingMode.HALF_EVEN).doubleValue());
 
             Driver driver = driverService.selectById(orderPrivateCar.getDriverId());
 
@@ -1916,7 +1933,7 @@
                                     settlementRecord.setInsertTime(new Date());
                                     settlementRecordService.insert(settlementRecord);
                                 }else{
-                                    settlementRecord.setPayMoney(total.doubleValue());
+                                    settlementRecord.setPayMoney(settlementRecord.getPayMoney() + total.doubleValue());
                                     settlementRecordService.updateById(settlementRecord);
                                 }
                                 for (SettlementDetail detail : settlementDetailList) {
@@ -1944,12 +1961,12 @@
                             if(null != orderPrivateCar.getDriverId()){
                                 aDouble = orderEvaluateService.queryDriverScore(orderPrivateCar.getDriverId());
                             }
-                            Double aDouble1 = Double.valueOf(orderPrivateCar.getMileage() / 1000);
+                            Double aDouble1 = new BigDecimal(orderPrivateCar.getMileage()).divide(new BigDecimal(1000)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
                             Driver driver = driverService.selectById(orderPrivateCar.getDriverId());
                             if(1 == language){
                                 document.getElementById("english").remove();
                                 document.getElementById("french").remove();
-                                document.getElementsByTag("title").get(0).text("I-GO电子收据");
+                                document.getElementsByTag("title").get(0).text("打车收据");
                                 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 qbj_chinese = document.getElementById("qbj_chinese");
@@ -2016,12 +2033,18 @@
                                 pay_type_chinese.text("现金");
                                 Element pay_money_chinese = document.getElementById("pay_money_chinese");
                                 pay_money_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+                                Element dispute_chinese = document.getElementById("dispute_chinese");
+                                if(null != orderPrivateCar.getIsDispute() && orderPrivateCar.getIsDispute() == 1){
+                                    dispute_chinese.text("（注意: 争议订单，经过三方协商，平台最终定价为 GHS" + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN) + "）");
+                                }else{
+                                    dispute_chinese.remove();
+                                }
                                 Element pdf_chinese = document.getElementById("pdf_chinese");
-                                pdf_chinese.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=1");
+                                pdf_chinese.attr("href", "https://igo.i-go.group/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=1");
                                 Element lost_item_chinese = document.getElementById("lost_item_chinese");
-                                lost_item_chinese.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=1");
+                                lost_item_chinese.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=1");
                                 Element track_chinese = document.getElementById("track_chinese");
-                                track_chinese.attr("href", "http://182.160.16.251:81/mailbox/user/location.html?orderId=" + orderId);
+                                track_chinese.attr("href", "https://igo.i-go.group/mailbox/user/location.html?orderId=" + orderId);
                                 Element pay_time_chinese = document.getElementById("pay_time_chinese");
                                 pay_time_chinese.text(DateUtil.conversionFormat(language, sdf1.format(orderPrivateCar.getEndServiceTime())));
                                 Elements driver_chinese = document.getElementsByClass("driver_chinese");
@@ -2050,7 +2073,7 @@
                             if(2 == language){
                                 document.getElementById("chinese").remove();
                                 document.getElementById("french").remove();
-                                document.getElementsByTag("title").get(0).text("Receipt");
+                                document.getElementsByTag("title").get(0).text("Ride 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 qbj_english = document.getElementById("qbj_english");
@@ -2117,12 +2140,18 @@
                                 pay_type_english.text("Cash");
                                 Element pay_money_english = document.getElementById("pay_money_english");
                                 pay_money_english.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+                                Element dispute_english = document.getElementById("dispute_english");
+                                if(null != orderPrivateCar.getIsDispute() && orderPrivateCar.getIsDispute() == 1){
+                                    dispute_english.text("（Note: Disputed order, after tripartite negotiation, the final pricing of the platform is GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN) + "）");
+                                }else{
+                                    dispute_english.remove();
+                                }
                                 Element pdf_english = document.getElementById("pdf_english");
-                                pdf_english.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=1");
+                                pdf_english.attr("href", "https://igo.i-go.group/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=1");
                                 Element lost_item_english = document.getElementById("lost_item_english");
-                                lost_item_english.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=1");
+                                lost_item_english.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=1");
                                 Element track_english = document.getElementById("track_english");
-                                track_english.attr("href", "http://182.160.16.251:81/mailbox/user/location.html?orderId=" + orderId);
+                                track_english.attr("href", "https://igo.i-go.group/mailbox/user/location.html?orderId=" + orderId);
                                 Element pay_time_english = document.getElementById("pay_time_english");
                                 pay_time_english.text(DateUtil.conversionFormat(language, sdf1.format(orderPrivateCar.getEndServiceTime())));
                                 Elements driver_english = document.getElementsByClass("driver_english");
@@ -2151,7 +2180,7 @@
                             if(3 == language){
                                 document.getElementById("chinese").remove();
                                 document.getElementById("english").remove();
-                                document.getElementsByTag("title").get(0).text("Reçu");
+                                document.getElementsByTag("title").get(0).text("Reçu de course");
                                 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 qbj_french = document.getElementById("qbj_french");
@@ -2218,12 +2247,18 @@
                                 pay_type_french.text("En espèces");
                                 Element pay_money_french = document.getElementById("pay_money_french");
                                 pay_money_french.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+                                Element dispute_french = document.getElementById("dispute_french");
+                                if(null != orderPrivateCar.getIsDispute() && orderPrivateCar.getIsDispute() == 1){
+                                    dispute_french.text("（Remarque: Il s’agit d’une commande contestée, et après des négociations entre trois parties, la plateforme l’a finalement tarifée à GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN) + "）");
+                                }else{
+                                    dispute_french.remove();
+                                }
                                 Element pdf_french = document.getElementById("pdf_french");
-                                pdf_french.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=1");
+                                pdf_french.attr("href", "https://igo.i-go.group/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=1");
                                 Element lost_item_french = document.getElementById("lost_item_french");
-                                lost_item_french.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=1");
+                                lost_item_french.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=1");
                                 Element track_french = document.getElementById("track_french");
-                                track_french.attr("href", "http://182.160.16.251:81/mailbox/user/location.html?orderId=" + orderId);
+                                track_french.attr("href", "https://igo.i-go.group/mailbox/user/location.html?orderId=" + orderId);
                                 Element pay_time_french = document.getElementById("pay_time_french");
                                 pay_time_french.text(DateUtil.conversionFormat(language, sdf1.format(orderPrivateCar.getEndServiceTime())));
                                 Elements driver_french = document.getElementsByClass("driver_french");
@@ -2250,14 +2285,14 @@
                                 server_tel_french.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
                             }
 
-                            EmailUtil.send(userInfo.getEmail(), language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu",  document.html());
+                            EmailUtil.send(userInfo.getEmail(), language == 1 ? "打车收据" : language == 2 ? "Ride receipt" : "Reçu de course",  document.html());
 
                             //开始生成pdf收据和html收据
-                            File file = new File("/usr/local/nginx/html/files/html/");
+                            File file = new File("/home/igotechgh/nginx/html/files/html/");
                             if(!file.exists()){
                                 file.mkdirs();
                             }
-                            file = new File("/usr/local/nginx/html/files/html/ride_receipt_" + orderId + ".html");
+                            file = new File("/home/igotechgh/nginx/html/files/html/ride_receipt_" + orderId + ".html");
                             if(!file.exists()){
                                 file.createNewFile();
                             }
@@ -2266,26 +2301,26 @@
                             fileWriter.flush();
                             fileWriter.close();
 
-                            File file1 = new File("/usr/local/nginx/html/files/pdf/");
+                            File file1 = new File("/home/igotechgh/nginx/html/files/pdf/");
                             if(!file1.exists()){
                                 file1.mkdirs();
                             }
-                            file1 = new File("/usr/local/nginx/html/files/pdf/ride_receipt_" + orderId + ".pdf");
+                            file1 = new File("/home/igotechgh/nginx/html/files/pdf/ride_receipt_" + orderId + ".pdf");
                             if(!file1.exists()){
                                 file1.createNewFile();
                             }
                             try {
                                 FileOutputStream fileOutputStream = new FileOutputStream(file1);
-                                HtmlToPdfUtils.convertToPdf("/usr/local/nginx/html/files/html/ride_receipt_" + orderId + ".html", "I-GO", fileOutputStream);
+                                HtmlToPdfUtils.convertToPdf("/home/igotechgh/nginx/html/files/html/ride_receipt_" + orderId + ".html", "I-GO", fileOutputStream);
                             }catch (Exception e){
                                 e.printStackTrace();
                                 System.out.println("html转pdf异常");
                             }
-                            String link ="http://182.160.16.251:81/files/html/ride_receipt_" + orderId + ".html";
+                            String link ="https://igo.i-go.group/files/html/ride_receipt_" + orderId + ".html";
                             TEmail tEmail = new TEmail();
                             tEmail.setLink(link);
                             tEmail.setUserId(uid);
-                            tEmail.setName(language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu");
+                            tEmail.setName(language == 1 ? "打车收据" : language == 2 ? "Ride receipt" : "Reçu de course");
                             tEmail.setType(1);
                             tEmail.setOrderId(orderId);
                             tEmail.setCreateTime(new Date());
@@ -2431,16 +2466,16 @@
                     Element user_french = document.getElementById("user_french");
                     user_french.text("Bonjour " + userInfo.getNickName() + "，");
                     Element time_french = document.getElementById("time_french");
-                    time_french.text("Cette promotion est valable du " + DateUtil.conversionFormat(language, sdf.format(id.getStartTime())) + " au " + DateUtil.conversionFormat(language, sdf.format(id.getEndTime())) + ". Veuillez consulter la plateforme i-go pour plus de détails.");
+                    time_french.text("Cette promotion est valable du " + DateUtil.conversionFormat(language, sdf.format(id.getStartTime())) + " au " + DateUtil.conversionFormat(language, sdf.format(id.getEndTime())) + ". Veuillez consulter la plateforme I-GO pour plus de détails.");
                 }
 
                 EmailUtil.send(userInfo.getEmail(), language == 1 ? "红包活动" : language == 2 ? "Lucky-promo activities" : "Activités bonus",  document.html());
                 //开始生成pdf收据和html收据
-                File file = new File("/usr/local/nginx/html/files/html/");
+                File file = new File("/home/igotechgh/nginx/html/files/html/");
                 if(!file.exists()){
                     file.mkdirs();
                 }
-                file = new File("/usr/local/nginx/html/files/html/redpacket_" + orderId + ".html");
+                file = new File("/home/igotechgh/nginx/html/files/html/redpacket_" + orderId + ".html");
                 if(!file.exists()){
                     file.createNewFile();
                 }
@@ -2449,7 +2484,7 @@
                 fileWriter.flush();
                 fileWriter.close();
 
-                String link ="http://182.160.16.251:81/files/html/redpacket_" + orderId + ".html";
+                String link ="https://igo.i-go.group/files/html/redpacket_" + orderId + ".html";
                 TEmail tEmail = new TEmail();
                 tEmail.setLink(link);
                 tEmail.setUserId(userInfo.getId());
@@ -2621,11 +2656,11 @@
                             if(null != orderPrivateCar.getDriverId()){
                                 aDouble = orderEvaluateService.queryDriverScore(orderPrivateCar.getDriverId());
                             }
-                            Double aDouble1 = Double.valueOf(orderPrivateCar.getMileage() / 1000);
+                            Double aDouble1 = new BigDecimal(orderPrivateCar.getMileage()).divide(new BigDecimal(1000)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
                             if(1 == language){
                                 document.getElementById("english").remove();
                                 document.getElementById("french").remove();
-                                document.getElementsByTag("title").get(0).text("I-GO电子收据");
+                                document.getElementsByTag("title").get(0).text("打车收据");
                                 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 qbj_chinese = document.getElementById("qbj_chinese");
@@ -2692,12 +2727,18 @@
                                 pay_type_chinese.text(orderPrivateCar.getPayType() == 1 ? "手机支付" : (orderPrivateCar.getPayType() == 2?"银行卡支付":(orderPrivateCar.getPayType() == 3?"余额支付":"现金支付")));
                                 Element pay_money_chinese = document.getElementById("pay_money_chinese");
                                 pay_money_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+                                Element dispute_chinese = document.getElementById("dispute_chinese");
+                                if(null != orderPrivateCar.getIsDispute() && orderPrivateCar.getIsDispute() == 1){
+                                    dispute_chinese.text("（注意: 争议订单，经过三方协商，平台最终定价为 GHS" + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN) + "）");
+                                }else{
+                                    dispute_chinese.remove();
+                                }
                                 Element pdf_chinese = document.getElementById("pdf_chinese");
-                                pdf_chinese.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + id + "&orderType=1");
+                                pdf_chinese.attr("href", "https://igo.i-go.group/user/base/order/uploadReceiptPdf?orderId=" + id + "&orderType=1");
                                 Element lost_item_chinese = document.getElementById("lost_item_chinese");
-                                lost_item_chinese.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + id + "&orderType=1");
+                                lost_item_chinese.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + id + "&orderType=1");
                                 Element track_chinese = document.getElementById("track_chinese");
-                                track_chinese.attr("href", "http://182.160.16.251:81/mailbox/user/location.html?orderId=" + id);
+                                track_chinese.attr("href", "https://igo.i-go.group/mailbox/user/location.html?orderId=" + id);
                                 Element pay_time_chinese = document.getElementById("pay_time_chinese");
                                 pay_time_chinese.text(DateUtil.conversionFormat(language, sdf1.format(orderPrivateCar.getEndServiceTime())));
                                 Elements driver_chinese = document.getElementsByClass("driver_chinese");
@@ -2726,7 +2767,7 @@
                             if(2 == language){
                                 document.getElementById("chinese").remove();
                                 document.getElementById("french").remove();
-                                document.getElementsByTag("title").get(0).text("Receipt");
+                                document.getElementsByTag("title").get(0).text("Ride 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 qbj_english = document.getElementById("qbj_english");
@@ -2793,12 +2834,18 @@
                                 pay_type_english.text(orderPrivateCar.getPayType() == 1 ? "Mobile money" :(orderPrivateCar.getPayType() == 2?"Bank card":(orderPrivateCar.getPayType() == 3?"I-GO Wallet":"Cash")));
                                 Element pay_money_english = document.getElementById("pay_money_english");
                                 pay_money_english.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+                                Element dispute_english = document.getElementById("dispute_english");
+                                if(null != orderPrivateCar.getIsDispute() && orderPrivateCar.getIsDispute() == 1){
+                                    dispute_english.text("（Note: Disputed order, after tripartite negotiation, the final pricing of the platform is GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN) + "）");
+                                }else{
+                                    dispute_english.remove();
+                                }
                                 Element pdf_english = document.getElementById("pdf_english");
-                                pdf_english.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + id + "&orderType=1");
+                                pdf_english.attr("href", "https://igo.i-go.group/user/base/order/uploadReceiptPdf?orderId=" + id + "&orderType=1");
                                 Element lost_item_english = document.getElementById("lost_item_english");
-                                lost_item_english.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + id + "&orderType=1");
+                                lost_item_english.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + id + "&orderType=1");
                                 Element track_english = document.getElementById("track_english");
-                                track_english.attr("href", "http://182.160.16.251:81/mailbox/user/location.html?orderId=" + id);
+                                track_english.attr("href", "https://igo.i-go.group/mailbox/user/location.html?orderId=" + id);
                                 Element pay_time_english = document.getElementById("pay_time_english");
                                 pay_time_english.text(DateUtil.conversionFormat(language, sdf1.format(orderPrivateCar.getEndServiceTime())));
                                 Elements driver_english = document.getElementsByClass("driver_english");
@@ -2827,7 +2874,7 @@
                             if(3 == language){
                                 document.getElementById("chinese").remove();
                                 document.getElementById("english").remove();
-                                document.getElementsByTag("title").get(0).text("Reçu");
+                                document.getElementsByTag("title").get(0).text("Reçu de course");
                                 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 qbj_french = document.getElementById("qbj_french");
@@ -2894,12 +2941,18 @@
                                 pay_type_french.text(orderPrivateCar.getPayType() == 1 ? "Argent mobile" : (orderPrivateCar.getPayType() == 2?"Carte bancaire":(orderPrivateCar.getPayType() == 3?"Portefeuille I-GO":"En espèces")));
                                 Element pay_money_french = document.getElementById("pay_money_french");
                                 pay_money_french.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+                                Element dispute_french = document.getElementById("dispute_french");
+                                if(null != orderPrivateCar.getIsDispute() && orderPrivateCar.getIsDispute() == 1){
+                                    dispute_french.text("（Remarque: Il s’agit d’une commande contestée, et après des négociations entre trois parties, la plateforme l’a finalement tarifée à GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN) + "）");
+                                }else{
+                                    dispute_french.remove();
+                                }
                                 Element pdf_french = document.getElementById("pdf_french");
-                                pdf_french.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + id + "&orderType=1");
+                                pdf_french.attr("href", "https://igo.i-go.group/user/base/order/uploadReceiptPdf?orderId=" + id + "&orderType=1");
                                 Element lost_item_french = document.getElementById("lost_item_french");
-                                lost_item_french.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + id + "&orderType=1");
+                                lost_item_french.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + id + "&orderType=1");
                                 Element track_french = document.getElementById("track_french");
-                                track_french.attr("href", "http://182.160.16.251:81/mailbox/user/location.html?orderId=" + id);
+                                track_french.attr("href", "https://igo.i-go.group/mailbox/user/location.html?orderId=" + id);
                                 Element pay_time_french = document.getElementById("pay_time_french");
                                 pay_time_french.text(DateUtil.conversionFormat(language, sdf1.format(orderPrivateCar.getEndServiceTime())));
                                 Elements driver_french = document.getElementsByClass("driver_french");
@@ -2926,14 +2979,14 @@
                                 server_tel_french.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
                             }
 
-                            EmailUtil.send(userInfo.getEmail(), language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu",  document.html());
+                            EmailUtil.send(userInfo.getEmail(), language == 1 ? "打车收据" : language == 2 ? "Ride receipt" : "Reçu de course",  document.html());
 
                             //开始生成pdf收据和html收据
-                            File file = new File("/usr/local/nginx/html/files/html/");
+                            File file = new File("/home/igotechgh/nginx/html/files/html/");
                             if(!file.exists()){
                                 file.mkdirs();
                             }
-                            file = new File("/usr/local/nginx/html/files/html/ride_receipt_" + id + ".html");
+                            file = new File("/home/igotechgh/nginx/html/files/html/ride_receipt_" + id + ".html");
                             if(!file.exists()){
                                 file.createNewFile();
                             }
@@ -2942,27 +2995,27 @@
                             fileWriter.flush();
                             fileWriter.close();
 
-                            File file1 = new File("/usr/local/nginx/html/files/pdf/");
+                            File file1 = new File("/home/igotechgh/nginx/html/files/pdf/");
                             if(!file1.exists()){
                                 file1.mkdirs();
                             }
-                            file1 = new File("/usr/local/nginx/html/files/pdf/ride_receipt_" + id + ".pdf");
+                            file1 = new File("/home/igotechgh/nginx/html/files/pdf/ride_receipt_" + id + ".pdf");
                             if(!file1.exists()){
                                 file1.createNewFile();
                             }
                             try {
                                 FileOutputStream fileOutputStream = new FileOutputStream(file1);
-                                HtmlToPdfUtils.convertToPdf("/usr/local/nginx/html/files/html/ride_receipt_" + id + ".html", "I-GO", fileOutputStream);
+                                HtmlToPdfUtils.convertToPdf("/home/igotechgh/nginx/html/files/html/ride_receipt_" + id + ".html", "I-GO", fileOutputStream);
                             }catch (Exception e){
                                 e.printStackTrace();
                                 System.out.println("html转pdf异常");
                             }
 
 
-                            String link ="http://182.160.16.251:81/files/html/ride_receipt_" + id + ".html";
+                            String link ="https://igo.i-go.group/files/html/ride_receipt_" + id + ".html";
                             TEmail tEmail = new TEmail();
                             tEmail.setLink(link);
-                            tEmail.setName(language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu");
+                            tEmail.setName(language == 1 ? "打车收据" : language == 2 ? "Ride receipt" : "Reçu de course");
                             tEmail.setUserId(userInfo.getId());
                             tEmail.setType(1);
                             tEmail.setOrderId(id);
@@ -3026,24 +3079,35 @@
                 map.put("state", map.get("oldState"));
             }
             if(state == 8 || state == 9){
-                map.put("receipt", "http://182.160.16.251:81/files/html/ride_receipt_" + orderId + ".html");
+                map.put("receipt", "https://igo.i-go.group/files/html/ride_receipt_" + orderId + ".html");
             }else{
                 map.put("receipt", "");
             }
     
             OrderPrivateCar orderPrivateCar = orderPrivateCarMapper.selectById(orderId);
-            long timeOutCancel = 0L;
-            if(null != orderPrivateCar.getEstimateArriveTime()){
-                CancleOrder cancleOrder = cancleOrderService.selectOne(new EntityWrapper<CancleOrder>().eq("companyId", orderPrivateCar.getCompanyId()));
-                JSONObject jsonObject = JSON.parseObject(cancleOrder.getContent());
-                int driverTimeout = jsonObject.getIntValue("driverTimeout") * 60000;
-                if(orderPrivateCar.getOrderType() == 1){
-                    timeOutCancel = orderPrivateCar.getEstimateArriveTime().getTime() + driverTimeout;
-                }else{
-                    timeOutCancel = orderPrivateCar.getTravelTime().getTime() + driverTimeout;
+            Integer driverTimeOutTime = 0;
+            Integer driverTimeOut = 0;
+            CancleOrder cancleOrder = cancleOrderService.selectOne(new EntityWrapper<CancleOrder>().eq("companyId", orderPrivateCar.getCompanyId()));
+            JSONObject jsonObject = JSON.parseObject(cancleOrder.getContent());
+            int driverTimeout1 = jsonObject.getIntValue("driverTimeout");
+            if(orderPrivateCar.getOrderType() == 1 && null != orderPrivateCar.getEstimateArriveTime()){
+                long time = orderPrivateCar.getEstimateArriveTime().getTime() + driverTimeout1 * 60000L;
+                if(System.currentTimeMillis() > time){
+                    driverTimeOutTime = Double.valueOf((System.currentTimeMillis() - time) / 60000).intValue();
+                    driverTimeOutTime = driverTimeOutTime == 0 ? 1 : driverTimeOutTime;
+                    driverTimeOut = 1;
+                }
+            }else{
+                long time = orderPrivateCar.getTravelTime().getTime() + driverTimeout1 * 60000L;
+                if(System.currentTimeMillis() >= time){
+                    driverTimeOutTime = Double.valueOf((System.currentTimeMillis() - time) / 60000).intValue();
+                    driverTimeOutTime = driverTimeOutTime == 0 ? 1 : driverTimeOutTime;
+                    driverTimeOut = 1;
                 }
             }
-            map.put("timeOutCancel", timeOutCancel);
+    
+            map.put("driverTimeOutTime", driverTimeOutTime);
+            map.put("driverTimeOut", driverTimeOut);
         }
         return maps;
     }
@@ -3054,7 +3118,7 @@
         endTime = dateUtil.getStartOrEndDate(endTime, "end");
         List<Map<String, Object>> list = orderPrivateCarMapper.queryInvoiceOrder(type, startTime, endTime, startMoney, endMoney, uid);
         for (Map<String, Object> map : list) {
-            map.put("orderName", language == 1 ? "打车订单" : language == 2 ? "Ride" : "Course");
+            map.put("orderName", language == 1 ? "打车" : language == 2 ? "Ride" : "Course");
             if(null != map.get("time")){
                 String time = map.get("time").toString();
                 map.put("time", DateUtil.conversionFormat(language, time));
@@ -3110,7 +3174,7 @@
         map.put("device", ToolUtil.isNotEmpty(driverId) ? 2 : 1);
         map.put("orderType", 1);
         if(state == 8 || state == 9){
-            map.put("receipt", "http://182.160.16.251:81/files/html/ride_receipt_" + orderId + ".html");
+            map.put("receipt", "https://igo.i-go.group/files/html/ride_receipt_" + orderId + ".html");
         }else{
             map.put("receipt", "");
         }
@@ -3119,21 +3183,30 @@
             companyId = Integer.valueOf(String.valueOf(map.get("companyId")));
         }
         
-        long timeOutCancel = 0L;
-        long driverTimeOut = 0L;
+        Integer driverTimeOutTime = 0;
+        Integer driverTimeOut = 0;
         CancleOrder cancleOrder = cancleOrderService.selectOne(new EntityWrapper<CancleOrder>().eq("companyId", companyId));
         JSONObject jsonObject = JSON.parseObject(cancleOrder.getContent());
-        int driverTimeout = jsonObject.getIntValue("driverTimeout") * 60000;
+        int driverTimeout1 = jsonObject.getIntValue("driverTimeout");
         if(orderPrivateCar.getOrderType() == 1 && null != orderPrivateCar.getEstimateArriveTime()){
-            timeOutCancel = orderPrivateCar.getEstimateArriveTime().getTime() + driverTimeout;
-            driverTimeOut = orderPrivateCar.getEstimateArriveTime().getTime();
+            long time = orderPrivateCar.getEstimateArriveTime().getTime() + driverTimeout1 * 60000L;
+            if(System.currentTimeMillis() > time){
+                driverTimeOutTime = Double.valueOf((System.currentTimeMillis() - time) / 60000).intValue();
+                driverTimeOutTime = driverTimeOutTime == 0 ? 1 : driverTimeOutTime;
+                driverTimeOut = 1;
+            }
         }else{
-            timeOutCancel = orderPrivateCar.getTravelTime().getTime() + driverTimeout;
-            driverTimeOut = orderPrivateCar.getTravelTime().getTime();
+            long time = orderPrivateCar.getTravelTime().getTime() + driverTimeout1 * 60000L;
+            if(System.currentTimeMillis() >= time){
+                driverTimeOutTime = Double.valueOf((System.currentTimeMillis() - time) / 60000).intValue();
+                driverTimeOutTime = driverTimeOutTime == 0 ? 1 : driverTimeOutTime;
+                driverTimeOut = 1;
+            }
         }
         
-        map.put("timeOutCancel", timeOutCancel);
+        map.put("driverTimeOutTime", driverTimeOutTime);
         map.put("driverTimeOut", driverTimeOut);
+        map.put("isDispute", orderPrivateCar.getIsDispute());
         return map;
     }
 
@@ -3173,7 +3246,7 @@
                 //读取文件(字符流)
                 BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(file),"UTF-8"));
                 //循环取出数据
-                String str = null;
+                String str;
                 StringBuffer sb = new StringBuffer();
                 while ((str = in.readLine()) != null) {
                     sb.append(str);
@@ -3188,10 +3261,11 @@
 
         String lnt = "0";
         String lat = "0";
+        String tripId = redisUtil.getValue("trip" + uid);
         if(ToolUtil.isNotEmpty(value)){
             lnt = value.split(",")[0];
             lat = value.split(",")[1];
-            DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(orderPrivateCar.getStartLat(), orderPrivateCar.getStartLon(), Double.valueOf(lat), Double.valueOf(lnt));
+            DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(orderPrivateCar.getStartLat(), orderPrivateCar.getStartLon(), Double.valueOf(lat), Double.valueOf(lnt), tripId);
 
             if(null == distancematrix){
                 System.err.println("查询距离出错了");
@@ -3219,7 +3293,7 @@
             orderServerWarpper.setLaveTime("0");
         }
         if(orderPrivateCar.getState() == 5 || orderPrivateCar.getState() == 6){//服务中
-            DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(Double.valueOf(lat), Double.valueOf(lnt), orderPrivateCar.getEndLat(), orderPrivateCar.getEndLon());
+            DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(Double.valueOf(lat), Double.valueOf(lnt), orderPrivateCar.getEndLat(), orderPrivateCar.getEndLon(), tripId);
             if(null == distancematrix){
                 System.err.println("查询距离出错了");
             }else if(distancematrix.getDistance() == 0){
@@ -3262,7 +3336,7 @@
     public List<Map<String, Object>> queryRedEnvelope(Integer language, Integer uid) throws Exception {
         List<Map<String, Object>> list = orderPrivateCarMapper.queryRedEnvelope(uid);
         for (Map<String, Object> map : list) {
-            map.put("name", language == 1 ? "打车订单" : language == 2 ? "Ride" : "Course");
+            map.put("name", language == 1 ? "打车" : language == 2 ? "Ride" : "Course");
             if(null != map.get("time")){
                 String time = map.get("time").toString();
                 map.put("time", DateUtil.conversionFormat(language, time));
@@ -3323,13 +3397,13 @@
             String audioUrl = "";
             switch (language1){
                 case 1:
-                    audioUrl = "http://182.160.16.251:81/files/audio/system/ChangeAddress-CN.mp3";
+                    audioUrl = "https://igo.i-go.group/files/audio/system/ChangeAddress-CN.mp3";
                     break;
                 case 2:
-                    audioUrl = "http://182.160.16.251:81/files/audio/system/ChangeAddress-EN.mp3";
+                    audioUrl = "https://igo.i-go.group/files/audio/system/ChangeAddress-EN.mp3";
                     break;
                 case 3:
-                    audioUrl = "http://182.160.16.251:81/files/audio/system/ChangeAddress-FR.mp3";
+                    audioUrl = "https://igo.i-go.group/files/audio/system/ChangeAddress-FR.mp3";
                     break;
             }
             pushUtil.pushModifyAddress(2, orderPrivateCar.getDriverId(), orderId, 1, 1, audioUrl);

--
Gitblit v1.7.1