From c10d5e4a97c28e10cd8d5aa2068194e4617a03e7 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 07 二月 2024 14:04:47 +0800
Subject: [PATCH] 修改pdf水印

---
 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 1534 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 1,301 insertions(+), 233 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 4f48d5c..20750b6 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
@@ -10,6 +10,8 @@
 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;
+import com.stylefeng.guns.modular.smallLogistics.server.IOrderLogisticsService;
 import com.stylefeng.guns.modular.specialTrain.dao.OrderPrivateCarMapper;
 import com.stylefeng.guns.modular.specialTrain.model.OrderPrivateCar;
 import com.stylefeng.guns.modular.specialTrain.server.IOrderPrivateCarService;
@@ -20,6 +22,9 @@
 import com.stylefeng.guns.modular.system.util.GoogleMap.DistancematrixVo;
 import com.stylefeng.guns.modular.system.util.GoogleMap.GoogleMapUtil;
 import com.stylefeng.guns.modular.system.util.GoogleMap.ReverseGeocodeVo;
+import com.stylefeng.guns.modular.system.util.Tingg.TinggPayUtil;
+import com.stylefeng.guns.modular.system.util.Tingg.model.CheckoutRequest;
+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;
@@ -30,6 +35,11 @@
 import com.stylefeng.guns.modular.taxi.service.IOrderTaxiService;
 import com.stylefeng.guns.modular.taxi.service.IPaymentRecordService;
 import com.stylefeng.guns.modular.taxi.service.ITransactionDetailsService;
+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;
 import org.springframework.http.HttpEntity;
@@ -41,11 +51,11 @@
 import org.springframework.web.client.RestTemplate;
 
 import javax.annotation.Resource;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStreamReader;
+import java.io.*;
 import java.math.BigDecimal;
+import java.math.MathContext;
+import java.math.RoundingMode;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 
@@ -112,12 +122,6 @@
     @Autowired
     private IPaymentRecordService paymentRecordService;
 
-    /*@Autowired
-    private ICBCPayUtil icbcPayUtil;*/
-
-    @Autowired
-    private PayMoneyUtil payMoneyUtil;
-
     @Autowired
     private ITransactionDetailsService transactionDetailsService;
 
@@ -143,19 +147,7 @@
     private RedisUtil redisUtil;
 
     @Autowired
-    private GDFalconUtil gdFalconUtil;
-
-    @Autowired
-    private GDMapGeocodingUtil gdMapGeocodingUtil;
-
-    @Autowired
-    private GDMapElectricFenceUtil gdMapElectricFenceUtil;
-
-    @Autowired
     private IOrderPositionService orderPositionService;
-
-    @Autowired
-    private PushMinistryOfTransportUtil pushMinistryOfTransportUtil;
 
     @Autowired
     private IOrderCrossCityService orderCrossCityService;
@@ -163,8 +155,17 @@
     @Autowired
     private IAssignOrderService assignOrderService;
 
+    @Resource
+    private CarMapper carMapper;
+
     @Autowired
-    private ALiSendSms aLiSendSms;
+    private IOrderEvaluateService orderEvaluateService;
+
+    @Autowired
+    private IOrderLogisticsService orderLogisticsService;
+
+    @Autowired
+    private IBankCardService bankCardService;
 
 
     @Value("${filePath}")
@@ -178,8 +179,23 @@
     @Value("${callbackPath}")
     private String callbackPath;
 
-    @Value("${pushMinistryOfTransport}")
-    private boolean pushMinistryOfTransport;
+    @Value("${spring.mail.template-path}")
+    private String templatePath;
+
+    @Autowired
+    private ISettlementDetailService settlementDetailService;
+
+    @Autowired
+    private ISettlementRecordService settlementRecordService;
+
+    @Autowired
+    private ISettlementAllocationService settlementAllocationService;
+
+    @Autowired
+    private TEmailService emailService;
+
+    @Autowired
+    private IPhoneService phoneService;
 
 
 
@@ -202,7 +218,7 @@
      */
     @Override
     public synchronized ResultUtil<BaseWarpper> saveOrderPrivateCar(Integer serverCarModelId, Date travelTime, Integer reservation, Integer instead, String placementLon, String placementLat, String startLon, String startLat,
-                                          String startAddress, String endLon, String endLat, String endAddress, String name, String phone, Integer orderSource, Integer driverId, Integer type, Integer uid) throws Exception {
+                                          String startAddress, String endLon, String endLat, String endAddress, String name, String phone, Integer orderSource, Integer driverId, Integer type, Integer uid, Integer language) throws Exception {
 
         //如果出行时间大于当前10分钟则默认为预约单
         if(travelTime.getTime() > (System.currentTimeMillis() + 600000)){
@@ -215,16 +231,16 @@
          */
         List<OrderPrivateCar> orderPrivateCars = orderPrivateCarMapper.queryByState(uid, 1, 1, 1, 2, 3, 4, 5, 6,  11);
         if(orderPrivateCars.size() > 0){
-            return ResultUtil.error("有未完成的订单");
+            return ResultUtil.error(language == 1 ? "有未完成的订单" : language == 2 ? "Uncompleted order(s)" : "Commande(s) non complétée(s)");
         }
         List<OrderTaxi> list = orderTaxiMapper.queryByState_(uid, 1, 1, 1, 2, 3, 4, 5, 6, 11);
         if(list.size() > 0){
-            return ResultUtil.error("有未完成的订单");
+            return ResultUtil.error(language == 1 ? "有未完成的订单" : language == 2 ? "Uncompleted order(s)" : "Commande(s) non complétée(s)");
         }
 
         orderPrivateCars = orderPrivateCarMapper.queryByState(uid, 2, 1, 1, 2, 3, 4, 5, 6,  11);
         if(orderPrivateCars.size() > 0 && reservation == 2){
-            return ResultUtil.error("有未完成的订单");
+            return ResultUtil.error(language == 1 ? "有未完成的订单" : language == 2 ? "Uncompleted order(s)" : "Commande(s) non complétée(s)");
         }
 
         orderPrivateCars = orderPrivateCarMapper.queryByState(uid, 1, 1, 7,12);
@@ -238,7 +254,7 @@
 
         list = orderTaxiMapper.queryByState_(uid, 2, 1, 1, 2, 3, 4, 5, 6, 11);
         if(list.size() > 0 && reservation == 2){
-            return ResultUtil.error("有未完成的订单");
+            return ResultUtil.error(language == 1 ? "有未完成的订单" : language == 2 ? "Uncompleted order(s)" : "Commande(s) non complétée(s)");
         }
 
         startAddress = startAddress.replaceAll("& #40;", "(");
@@ -246,7 +262,7 @@
         endAddress = endAddress.replaceAll("& #40;", "(");
         endAddress = endAddress.replaceAll("& #41;", ")");
         if((orderSource == 1 || orderSource == 3) && null == serverCarModelId){
-            return ResultUtil.error("请选择服务车型");
+            return ResultUtil.error(language == 1 ? "请选择服务车型" : language == 2 ? "Please select vehicle-type" : "Veuillez sélectionner le type de véhicule");
         }
 
         OrderPrivateCar orderPrivateCar = new OrderPrivateCar();
@@ -271,9 +287,9 @@
         if(instead == 0 || ToolUtil.isEmpty(orderPrivateCar.getPassengers())){
             UserInfo userInfo = userInfoService.selectById(uid);
             if(ToolUtil.isEmpty(userInfo.getPhone())){
-                return ResultUtil.error("请先绑定手机号码");
+                return ResultUtil.error(language == 1 ? "请先绑定手机号码" : language == 2 ? "Please bind your mobile phone number first." : "Veuillez d’abord vous inscrire en liant votre numéro de téléphone portable.");
             }
-            orderPrivateCar.setPassengers(userInfo.getName());
+            orderPrivateCar.setPassengers(userInfo.getFirstName() + "." + userInfo.getLastName());
             orderPrivateCar.setPassengersPhone(userInfo.getPhone());
         }
         orderPrivateCar.setState(1);
@@ -284,26 +300,35 @@
         if(orderSource == 2){//扫码下单
             Driver driver = driverService.selectById(driverId);
             if(null == driver){
-                return ResultUtil.error("司机信息有误，无法完成下单");
+                return ResultUtil.error(language == 1 ? "司机信息有误，无法完成下单" : language == 2 ? "Wrong driver-information, unable to place an order." : "Informations erronées sur le chauffeur, il ne peut donc pas passer une commande.");
             }
             if(driver.getAuthState() == 1){
-                return ResultUtil.error("司机信息还未完成审核，无法完成下单");
+                return ResultUtil.error(language == 1 ? "司机信息还未完成审核，无法完成下单" : language == 2 ? "The driver is not yet done with review, unable to place an order." : "Le chauffeur n’a pas encore terminé son examen, il ne peut donc pas passer une commande.");
             }
             if(driver.getAuthState() == 3){
-                return ResultUtil.error("司机账户已被冻结，无法提供服务");
+                return ResultUtil.error(language == 1 ? "司机账户已被冻结，无法提供服务" : language == 2 ? "Driver account is frozen, unable to provide service." : "Le compte du chauffeur est gelé, il n’est donc pas possible de fournir des services.");
             }
             if(driver.getAuthState() == 4){
-                return ResultUtil.error("司机信息未通过审核，无法提供服务");
+                return ResultUtil.error(language == 1 ? "司机信息未通过审核，无法提供服务" : language == 2 ? "The driver is not verified and qualified, unable to provide service." : "Le chauffeur n’est pas vérifié et qualifié, incapable de fournir le services.");
             }
             if(driver.getState() == 1){
-                return ResultUtil.error("司机还未上线，无法提供服务");
+                return ResultUtil.error(language == 1 ? "司机还未上线，无法提供服务" : language == 2 ? "The driver is not online, unable to provide service." : "Le chauffeur n’est pas en ligne, incapable de fournir le services.");
             }
             if(driver.getState() == 3){
-                return ResultUtil.error("司机正在服务中，无法提供服务");
+                return ResultUtil.error(language == 1 ? "司机正在服务中，无法提供服务" : language == 2 ? "The driver is on a trip, unable to provide service." : "Le chauffeur est en service, incapable de fournir des services.");
             }
             List<DriverService> query = driverServiceService.query(driverId, 1);
             if(query.size() == 0){
-                return ResultUtil.error("该司机不能服务此业务");
+                return ResultUtil.error(language == 1 ? "该司机不能服务此业务" : language == 2 ? "Driver has outstanding fees to pay, unable to receive orders." : "Le chauffeur a des frais impayés à payer, incapable de recevoir des commandes.");
+            }
+
+            int count = this.selectCount(new EntityWrapper<OrderPrivateCar>().eq("driverId", driverId).eq("driverPay", 1).in("state", Arrays.asList(7, 8, 9)).eq("isDelete", 1));
+            if(count > 0){
+                return ResultUtil.error(language == 1 ? "司机未支付订单费用，无法进行接单" : language == 2 ? "Driver has outstanding fees to pay, unable to receive orders." : "Le chauffeur a des frais impayés à payer, incapable de recevoir des commandes.");
+            }
+            int count1 = orderLogisticsService.selectCount(new EntityWrapper<OrderLogistics>().eq("driverId", driverId).eq("driverPay", 1).ne("state", 10).eq("isDelete", 1));
+            if(count1 > 0){
+                return ResultUtil.error(language == 1 ? "司机未支付订单费用，无法进行接单" : language == 2 ? "Driver has outstanding fees to pay, unable to receive orders." : "Le chauffeur a des frais impayés à payer, incapable de recevoir des commandes.");
             }
 
             orderPrivateCar.setDriverId(driverId);
@@ -314,20 +339,6 @@
             CarService query1 = carServiceMapper.query(1, driver.getCarId());
             orderPrivateCar.setServerCarModelId(query1.getServerCarModelId());
             orderPrivateCar.setSnatchOrderTime(new Date());
-
-            //调用高德创建轨迹
-//            String s = gdFalconUtil.selectTerminal(driver.getPhone());
-//            String track = gdFalconUtil.createTrack(s);
-//            orderPrivateCar.setTrackId(track);
-
-            //调用移动的小号接口
-           /* Map<String, String> geocode1 = gdMapGeocodingUtil.geocode(orderPrivateCar.getStartLon().toString(), orderPrivateCar.getStartLat().toString());
-            Region region = regionMapper.query(geocode1.get("districtCode"));*/
-//            Map<String, String> map = chinaMobileUtil.midAxbBindSend(orderPrivateCar.getPassengersPhone(), driver.getPhone(), null);
-//            if(String.valueOf(map.get("code")).equals("200")){
-//                orderPrivateCar.setTelX(map.get("telX"));
-//                orderPrivateCar.setBindId(map.get("bindId"));
-//            }
 
             driver.setState(3);
             driverService.updateById(driver);
@@ -351,12 +362,12 @@
 
         // TODO: 2021/5/11 修改，根据后台设定的派单范围查询范围内有无司机，将单子指派给距离最近的司机（距离相同随机取），范围内没有司机再进行推单流程
         if(orderPrivateCar.getState() == 1){
-            Company query = companyCityService.query(orderPrivateCar.getStartLon().toString(), orderPrivateCar.getStartLat().toString());
+            Company query = companyCityService.query1(orderPrivateCar.getStartLon().toString(), orderPrivateCar.getStartLat().toString());
             if(null == query){
-                return ResultUtil.error("起点暂未企业提供服务");
+                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){//配置了指派规则才处理
+            if(null != assignOrder && assignOrder.getPeople() > 0){//配置了指派规则才处理
                 //获取空闲司机
                 List<Driver> drivers = driverService.queryIdleDriver(1, orderPrivateCar.getServerCarModelId(), orderPrivateCar.getStartLon(), orderPrivateCar.getStartLat(), assignOrder.getDistance(), null);//获取范围内空闲司机
                 if(drivers.size() > 0){//有司机，直接指派给司机
@@ -411,20 +422,6 @@
                     orderPrivateCar.setServerCarModelId(query1.getServerCarModelId());
                     orderPrivateCar.setSnatchOrderTime(new Date());
 
-                    //调用高德创建轨迹
-//                    String s = gdFalconUtil.selectTerminal(dr.getPhone());
-//                    String track = gdFalconUtil.createTrack(s);
-//                    orderPrivateCar.setTrackId(track);
-
-                    //调用移动的小号接口
-               /* Map<String, String> geocode1 = gdMapGeocodingUtil.geocode(orderPrivateCar.getStartLon().toString(), orderPrivateCar.getStartLat().toString());
-                Region region = regionMapper.query(geocode1.get("districtCode"));*/
-//                    Map<String, String> map = chinaMobileUtil.midAxbBindSend(orderPrivateCar.getPassengersPhone(), dr.getPhone(), null);
-//                    if(String.valueOf(map.get("code")).equals("200")){
-//                        orderPrivateCar.setTelX(map.get("telX"));
-//                        orderPrivateCar.setBindId(map.get("bindId"));
-//                    }
-
                     dr.setState(3);
                     driverService.updateById(dr);
                     this.updateById(orderPrivateCar);
@@ -449,7 +446,9 @@
 
 
         //添加消息
-        systemNoticeService.addSystemNotice(1, "您的专车订单已下单成功，我们正在为您指派司机，请稍后！", orderPrivateCar.getUserId(), 1);
+        systemNoticeService.addSystemNotice(1, language == 1 ? "您的打车订单已下单成功，我们正在为您指派司机，请稍后！" :
+                language == 2 ? "You've placed the ride order successfully, we are assigning you a driver, please wait." :
+                        "Vous avez passé la commande de course avec succès, nous vous attribuons un chauffeur, veuillez patienter.", orderPrivateCar.getUserId(), 1);
 
         BaseWarpper baseWarpper = new BaseWarpper();
         baseWarpper.setState(orderPrivateCar.getState());
@@ -469,10 +468,10 @@
         language = userInfoService.queryLanguage(uid, language);
         OrderPrivateCar orderPrivateCar = this.selectById(id);
         if(null == orderPrivateCar){
-            return ResultUtil.error(language == 1 ? "推送订单失败，订单信息有误" : language == 2 ? "Failed to push the order, the order information is wrong" : "Impossible de pousser la commande, les informations de commande sont erronées");
+            return ResultUtil.error(language == 1 ? "推送订单失败，订单信息有误" : language == 2 ? "Failed to deliver order, order-information error." : "Echec de l’envoi de la commande, erreur d’information de commande.");
         }
         if(orderPrivateCar.getState() != 1){
-            return ResultUtil.error(language == 1 ? "订单已被司机接单，不能重复推送" : language == 2 ? "The order has been taken by the driver and cannot be pushed repeatedly" : "La commande a été prise par le chauffeur et ne peut pas être poussée à plusieurs reprises");
+            return ResultUtil.error(language == 1 ? "订单已被司机接单，不能重复推送" : language == 2 ? "Driver has received the order, do not redeliver it." : "Le chauffeur a déjà reçu la commande，Il ne peut pas être répété");
         }
         //处理摆渡订单的继续推单操作
         if(orderPrivateCar.getType() == 2){
@@ -481,7 +480,7 @@
             List<Map<String, Integer>> orders = new ArrayList<>();
             for(OrderPrivateCar orderPrivateCar1 : list){
                 if(orderPrivateCar1.getState() != 1){
-                    return ResultUtil.error(language == 1 ? "订单已被司机接单，推单取消" : language == 2 ? "The order has been taken by the driver, and the push order has been cancelled" : "La commande a été prise par le chauffeur et la commande push a été annulée");
+                    return ResultUtil.error(language == 1 ? "订单已被司机接单，推单取消" : language == 2 ? "Driver has received the order, order-delivering cancelled." : "Le chauffeur a déjà reçu la commande. Envoyez-la commande l'annuler.");
                 }
                 Map<String, Integer> map = new HashMap<>();
                 map.put("orderType", 1);
@@ -491,7 +490,7 @@
             List<OrderTaxi> list1 = orderTaxiService.selectList(new EntityWrapper<OrderTaxi>().eq("type", 2).eq("crossCityOrderId", orderPrivateCar.getCrossCityOrderId()).eq("place", orderPrivateCar.getPlace()));
             for(OrderTaxi orderTaxi : list1){
                 if(orderTaxi.getState() != 1){
-                    return ResultUtil.error(language == 1 ? "订单已被司机接单，推单取消" : language == 2 ? "The order has been taken by the driver, and the push order has been cancelled" : "La commande a été prise par le chauffeur et la commande push a été annulée");
+                    return ResultUtil.error(language == 1 ? "订单已被司机接单，推单取消" : language == 2 ? "Driver has received the order, order-delivering cancelled." : "Le chauffeur a déjà reçu la commande. Envoyez-la commande l'annuler.");
                 }
                 Map<String, Integer> map = new HashMap<>();
                 map.put("orderType", 2);
@@ -508,15 +507,15 @@
     }
 
     @Override
-    public ResultUtil<BaseWarpper> queryCancleAmount(Integer id) throws Exception {
+    public ResultUtil<BaseWarpper> queryCancleAmount(Integer id, Integer language) throws Exception {
         OrderPrivateCar orderPrivateCar = this.selectById(id);
         if(null == orderPrivateCar){
-            return ResultUtil.error("获取数据失败，订单信息有误");
+            return ResultUtil.error(language == 1 ? "获取数据失败，订单信息有误" : language == 2 ? "Failed to obtain data, order-information error." : "Impossible d’obtenir les données, erreur d’information de commande. ");
         }
         double amount = 0;
         CancleOrder query = cancleOrderService.query(orderPrivateCar.getOrderType(), 1, orderPrivateCar.getCompanyId());
-        if(null != orderPrivateCar.getDriverId() && orderPrivateCar.getArriveTime()!=null &&
-                (orderPrivateCar.getArriveTime().getTime() + query.getMinuteNum() * 60 * 1000) < new Date().getTime()){//收费的情况
+        if(null != orderPrivateCar.getDriverId() && orderPrivateCar.getSnatchOrderTime()!=null &&
+                (orderPrivateCar.getSnatchOrderTime().getTime() + query.getMinuteNum() * 60 * 1000) < new Date().getTime()){//收费的情况
             if(null != query){
                 amount += query.getMoney();
             }
@@ -541,10 +540,10 @@
         OrderPrivateCar orderPrivateCar = this.selectById(id);
         Integer integer = null;
         if(null == orderPrivateCar){
-            return ResultUtil.error(language == 1 ? "取消订单失败，订单信息有误" : language == 2 ? "Failed to cancel the order, the order information is incorrect" : "Échec de l'annulation de la commande, les informations de la commande sont incorrectes");
+            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() != 11){
-            return ResultUtil.error(language == 1 ? "取消订单失败，不合法的操作" : language == 2 ? "Cancel order failed, illegal operation" : "Échec de l'annulation de la commande, opération illégale");
+            return ResultUtil.error(language == 1 ? "取消订单失败，不合法的操作" : language == 2 ? "Failed to cancel order, illegal operation." : "Échec de l’annulation de la commande, opération illégale.");
         }
         if(null == orderPrivateCar.getDriverId()){//没有接单的情况
             if(orderPrivateCar.getType() == 2){//摆渡车
@@ -594,23 +593,13 @@
                 driver.setState(2);
                 driverService.updateById(driver);
             }else{
-                return ResultUtil.error(language == 1 ? "请完善后台取消规则设置" : language == 2 ? "Please improve the background cancellation rule settings" : "Veuillez améliorer les paramètres de la règle d'annulation en arrière-plan");
+                return ResultUtil.error(language == 1 ? "请完善后台取消规则设置" : language == 2 ? "Please complete the setting of cancellation rules from the background." : "Veuillez compléter le réglage des règles d’annulation à partir de l’arrière-plan.");
             }
 
         }
 
-        new Thread(new Runnable() {
-            @Override
-            public void run() {
-                if(pushMinistryOfTransport){
-                    //上传数据
-                    pushMinistryOfTransportUtil.orderCancel(orderPrivateCar.getId());
-                }
-            }
-        }).start();
-
         //添加消息
-        systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功取消出行订单，谢谢使用！" : language == 2 ? "You have successfully canceled the travel order, thank you for using" : "Vous avez annulé avec succès la commande de voyage, merci d'utiliser", orderPrivateCar.getUserId(), 1);
+        systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功取消出行订单，谢谢使用！" : language == 2 ? "You've cancelled the ride order successfully, thank you for using I-GO " : "Vous avez annulé la commande de course avec succès, merci d’utiliser I-GO", orderPrivateCar.getUserId(), 1);
         Map<String, Object> map = new HashMap<>();
         map.put("id", integer);
         return ResultUtil.success(map);
@@ -624,17 +613,17 @@
      * @throws Exception
      */
     @Override
-    public ResultUtil cancleOrderPrivateCar(Integer id, Integer payType, Integer cancleId, Integer type) throws Exception {
+    public ResultUtil cancleOrderPrivateCar(Integer id, Integer payType, Integer bankCardId, Integer cancleId, Integer type, Integer language) throws Exception {
         OrderPrivateCar orderPrivateCar = this.selectById(id);
         Integer uid = orderPrivateCar.getUserId();
         UserInfo userInfo = userInfoService.selectById(uid);
         ResultUtil resultUtil = ResultUtil.success("");
 
         if(null == orderPrivateCar){
-            return ResultUtil.error("取消订单失败，订单信息有误", "");
+            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() != 12){
-            return ResultUtil.error("取消订单失败，不合法的操作", "");
+            return ResultUtil.error(language == 1 ? "取消订单失败，不合法的操作" : language == 2 ? "Failed to cancel order, illegal operation." : "Échec de l’annulation de la commande, opération illégale.", "");
         }
         OrderCancel orderCancel = null;
         if(null == cancleId || cancleId==0){
@@ -645,33 +634,58 @@
 
         CancleOrder query = cancleOrderService.query(orderPrivateCar.getOrderType(), 1, orderPrivateCar.getCompanyId());
         if(null != query){
-            if(payType == 1){//微信支付
+            if(payType == 1){//手机支付
                 orderCancel.setPayType(1);
                 orderCancelService.updateById(orderCancel);
-                resultUtil =  payMoneyUtil.weixinpay("订单取消",id +"",id + "_1_fei",query.getMoney()+"","/base/wxCancelOrderTaxi","JSAPI",userInfo.getAppletsOpenId());
-                //Map<String, String> map = icbcPayUtil.placeAnOrder(id + ",1", 9, 5, uid.toString(), "订单取消", query.getMoney(), callbackPath + "/base/wxCancelOrderTaxi", "", type, userInfo.getAppletsOpenId());
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
+                String merchantTransactionId = sdf.format(new Date()) + "1" + language + id;
+                CheckoutRequest checkoutRequest = new CheckoutRequest();
+                checkoutRequest.setMsisdn(Long.valueOf(userInfo.getPhone()));
+                checkoutRequest.setCustomerEmail(userInfo.getEmail());
+                checkoutRequest.setAccountNumber(userInfo.getPhone());
+                checkoutRequest.setCustomerFirstName(userInfo.getFirstName());
+                checkoutRequest.setCustomerLastName(userInfo.getLastName());
+                checkoutRequest.setRequestAmount(query.getMoney());
+                checkoutRequest.setMerchantTransactionId(merchantTransactionId);
+                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");
+                resultUtil = TinggPayUtil.checkoutRequest(checkoutRequest);
                 if(resultUtil.getCode()==200){
                     paymentRecordService.saveData(1, null, null, id, 1, 1, query.getMoney(), null, 1);//添加预支付数据
-                    resultUtil = resultUtil;
-                }else{
-                    resultUtil = ResultUtil.error("支付失败", "");
                 }
 
             }
-            if(payType == 2){//支付宝支付
+            if(payType == 2){//银行卡支付
                 orderCancel.setPayType(2);
                 orderCancelService.updateById(orderCancel);
-                resultUtil =  payMoneyUtil.alipay("订单取消","订单取消",id + "_1_fei",query.getMoney()+"","/base/aliCancelOrderTaxi");
+                BankCard bankCard = bankCardService.selectById(bankCardId);
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
+                String merchantTransactionId = sdf.format(new Date()) + "1" + id;
+                CheckoutRequest checkoutRequest = new CheckoutRequest();
+                checkoutRequest.setMsisdn(Long.valueOf(bankCard.getCode()));
+                checkoutRequest.setCustomerEmail(userInfo.getEmail());
+                checkoutRequest.setAccountNumber(bankCard.getCode());
+                checkoutRequest.setCustomerFirstName(bankCard.getFirstName());
+                checkoutRequest.setCustomerLastName(bankCard.getLastName());
+                checkoutRequest.setRequestAmount(query.getMoney());
+                checkoutRequest.setMerchantTransactionId(merchantTransactionId);
+                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");
+                resultUtil = TinggPayUtil.checkoutRequest(checkoutRequest);
                 if(resultUtil.getCode()==200){
                     paymentRecordService.saveData(1, null, null, id, 1, 2, query.getMoney(), null, 1);//添加预支付数据
-                    resultUtil = resultUtil;
-                }else{
-                    resultUtil = ResultUtil.error("支付失败", "");
                 }
+
             }
             if(payType == 3){//余额支付
                 if(userInfo.getBalance() != null && userInfo.getBalance() < query.getMoney()){
-                    return ResultUtil.error("余额不足，无法完成支付", "");
+                    return ResultUtil.error((language == 1 ? "账户余额不足" : language == 2 ? "Insufficient balance" : "Solde insuffisant"), "");
                 }
 
                 userInfo.setBalance(new BigDecimal(userInfo.getBalance()).subtract(new BigDecimal(query.getMoney())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
@@ -693,11 +707,11 @@
                 orderCancel.setPayType(3);
                 orderCancelService.updateById(orderCancel);
 
-                //添加已收入明细
-                incomeService.saveData(1, orderPrivateCar.getCompanyId(), 3, orderPrivateCar.getId(), 1, query.getMoney());
-                //添加已收入明细
-                Company company = companyService.selectById(orderPrivateCar.getCompanyId());
-                Double taxi = company.getSpeMoney();
+//                //添加已收入明细
+//                incomeService.saveData(1, orderPrivateCar.getCompanyId(), 3, orderPrivateCar.getId(), 1, query.getMoney());
+//                //添加已收入明细
+//                Company company = companyService.selectById(orderPrivateCar.getCompanyId());
+//                Double taxi = company.getSpeMoney();
                 BigDecimal c =new BigDecimal(query.getMoney());//司机收入
                 incomeService.saveData(2, orderPrivateCar.getDriverId(), 3, orderPrivateCar.getId(), 1, c.doubleValue());
                 Driver driver = driverService.selectById(orderPrivateCar.getDriverId());
@@ -708,15 +722,10 @@
 
                 this.deleteTask(id);//删除定时任务
 
-//                new Thread(new Runnable() {
-//                    @Override
-//                    public void run() {
-//                        pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0);
-//                    }
-//                }).start();
-
                 //添加消息
-                systemNoticeService.addSystemNotice(1, "您已使用余额成功支付取消订单费用，谢谢使用！", orderPrivateCar.getUserId(), 1);
+                systemNoticeService.addSystemNotice(1, language == 1 ? "您已使用余额成功支付取消订单费用，谢谢使用！" : language == 2
+                        ? "You've paid for cancellation fee with the balance successfully, thank you for using I-GO"
+                        : "Vous avez utilisé avec succès votre solde pour payer les frais d’annulation, merci d’utiliser I-GO", orderPrivateCar.getUserId(), 1);
             }
         }
         return resultUtil;
@@ -739,12 +748,13 @@
                     if(ToolUtil.isNotEmpty(vehicle)){
                         integers = JSON.parseArray(vehicle).toJavaList(Integer.class);
                     }
-                    Company query = companyCityService.query(String.valueOf(orderPrivateCar.getStartLon()), String.valueOf(orderPrivateCar.getStartLat()));//获取起点所属分公司
+                    Company query = companyCityService.query1(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);//所有附近空闲司机
+                        System.err.println("【" + orderPrivateCar.getId() + "】空闲司机：" + JSON.toJSONString(list));
                         if(list.size() > 0){
                             double driverProportion = pushOrder.getDriverProportion() / 100;//推送占比计算成小数
                             int lastIndex = Double.valueOf(list.size() * driverProportion).intValue();//计算占比转成整数（下标截取）
@@ -769,8 +779,11 @@
                             break;
                         }
                         if(i == querys.size() && state == 1){
-                            pushUtil.pushEndPush(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1);
-                            orderIds.remove(orderPrivateCar.getId());
+                            OrderPrivateCar orderPrivateCar1 = OrderPrivateCarServiceImpl.this.selectById(orderPrivateCar.getId());
+                            if(orderPrivateCar1.getState() == 1){
+                                pushUtil.pushEndPush(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1);
+                                orderIds.remove(orderPrivateCar.getId());
+                            }
                         }
                     }
                 } catch (Exception e) {
@@ -814,55 +827,96 @@
         UserInfo userInfo = userInfoService.selectById(uid);
         map.put("balance", userInfo.getBalance());
         OrderPrivateCar orderPrivateCar = this.selectById(orderId);
-        int i = userCouponRecordService.queryAvailable(uid, orderPrivateCar.getCompanyId(), 1, 1, orderPrivateCar.getOrderMoney());
-        i = i + userCouponRecordService.queryAvailable(uid, orderPrivateCar.getCompanyId(), 1, 0, orderPrivateCar.getOrderMoney());
+        UserActivityDiscount1 query2 = userActivityDiscount1Mapper.query(orderPrivateCar.getCompanyId());
+        double v = orderPrivateCar.getOrderMoney();
+        if(null != query2){
+            Integer orderNum=this.selectCount(new EntityWrapper<OrderPrivateCar>().eq("userId",orderPrivateCar.getUserId()).eq("activityId",query2.getId()).last(" and to_days(getoffTime) = to_days(now())"));
+            if(query2.getDistance()*1000>orderPrivateCar.getMileage() && query2.getOrderNum()>orderNum){
+                Double special = query2.getSpecial();
+                orderPrivateCar.setDiscount(special);
+                Double orderMoney = orderPrivateCar.getOrderMoney();
+                v = new BigDecimal(orderMoney).multiply(new BigDecimal(special / 10)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
+            }
+        }
+        int i = userCouponRecordService.queryAvailable(uid, orderPrivateCar.getCompanyId(), 1, 1, v);
+        i = i + userCouponRecordService.queryAvailable(uid, orderPrivateCar.getCompanyId(), 1, 0, v);
         map.put("coupon", i);
         return map;
     }
 
     @Override
-    public List<Map<String, Object>> queryCoupon(Integer orderId, Integer uid, Integer pageNum, Integer size) throws Exception {
+    public List<Map<String, Object>> queryCoupon(Integer language, Integer orderId, Integer uid, Integer pageNum, Integer size) throws Exception {
         OrderPrivateCar orderPrivateCar = this.selectById(orderId);
-        List<Map<String, Object>> list = userCouponRecordService.queryCoupon(uid, orderPrivateCar.getCompanyId(), 1, 1, orderPrivateCar.getOrderMoney(), pageNum, size);
-        List<Map<String, Object>> list1 = userCouponRecordService.queryCoupon(uid, orderPrivateCar.getCompanyId(), 1, 0, orderPrivateCar.getOrderMoney(), pageNum, size);
+        UserActivityDiscount1 query2 = userActivityDiscount1Mapper.query(orderPrivateCar.getCompanyId());
+        double v = orderPrivateCar.getOrderMoney();
+        if(null != query2){
+            Integer orderNum=this.selectCount(new EntityWrapper<OrderPrivateCar>().eq("userId",orderPrivateCar.getUserId()).eq("activityId",query2.getId()).last(" and to_days(getoffTime) = to_days(now())"));
+            if(query2.getDistance()*1000>orderPrivateCar.getMileage() && query2.getOrderNum()>orderNum){
+                Double special = query2.getSpecial();
+                orderPrivateCar.setDiscount(special);
+                Double orderMoney = orderPrivateCar.getOrderMoney();
+                v = new BigDecimal(orderMoney).multiply(new BigDecimal(special / 10)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
+            }
+        }
+        List<Map<String, Object>> list = userCouponRecordService.queryCoupon(language, uid, orderPrivateCar.getCompanyId(), 1, 1, v, pageNum, size);
+        List<Map<String, Object>> list1 = userCouponRecordService.queryCoupon(language, uid, orderPrivateCar.getCompanyId(), 1, 0, v, pageNum, size);
         list.addAll(list1);
         return list;
     }
 
+
+
+
     @Override
-    public ResultUtil payPrivateCarOrder(Integer payType, Integer orderId, Integer couponId, Integer type) throws Exception {
+    public ResultUtil payPrivateCarOrder(Integer payType, Integer bankCardId, Integer orderId, Integer couponId, Integer type, Integer language) throws Exception {
         OrderPrivateCar orderPrivateCar = this.selectById(orderId);
         if(orderPrivateCar.getState() == 8 || orderPrivateCar.getState() == 9){
-            return ResultUtil.error("订单已完成支付，不允许重复支付", "");
+            return ResultUtil.error(language == 1 ? "订单已完成支付，不允许重复支付" : language == 2 ? "The order has been paid, recurring payments is not allowed." : "La commande a été payée, les paiements récurrents ne sont pas autorisés.", "");
         }
         if(orderPrivateCar.getState() != 7){
-            return ResultUtil.error("订单不在待支付状态，不允许支付", "");
+            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();
         UserInfo userInfo = userInfoService.selectById(uid);
-        ResultUtil resultUtil = ResultUtil.success(new HashMap<>());
+        ResultUtil resultUtil = ResultUtil.success("");
         orderPrivateCar.setCouponMoney(0D);//初始化历史数据
         orderPrivateCar.setCouponId(null);
+
+        //计算折扣
+        UserActivityDiscount1 query2 = userActivityDiscount1Mapper.query(orderPrivateCar.getCompanyId());
+        if(null != query2){
+            Integer orderNum=this.selectCount(new EntityWrapper<OrderPrivateCar>().eq("userId",orderPrivateCar.getUserId()).eq("activityId",query2.getId()).last(" and to_days(getoffTime) = to_days(now())"));
+            if(query2.getDistance()*1000>orderPrivateCar.getMileage() && query2.getOrderNum()>orderNum){
+                Double special = query2.getSpecial();
+                orderPrivateCar.setDiscount(special);
+                double v = new BigDecimal(orderMoney).multiply(new BigDecimal(special / 10)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
+                if(orderMoney.compareTo(v) > 0){
+                    orderPrivateCar.setDiscountMoney(orderMoney - v);
+                    orderPrivateCar.setActivityId(query2.getId());
+                    orderMoney = v;
+                }
+            }
+        }
 
         //计算优惠券
         UserCouponRecord userCouponRecord = null;
         if(null != couponId){
             userCouponRecord = userCouponRecordService.selectById(couponId);
             if(userCouponRecord.getCompanyId() != orderPrivateCar.getCompanyId()){
-                return ResultUtil.error("优惠券不能用于此订单", "");
+                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.getState() == 2){
-                return ResultUtil.error("优惠券已使用", "");
+                return ResultUtil.error(language == 1 ? "优惠券已使用" : language == 2 ? "Coupon has been used." : "Le coupon a été utilisé.", "");
             }
             if(userCouponRecord.getState() == 3){
-                return ResultUtil.error("优惠券已过期", "");
+                return ResultUtil.error(language == 1 ? "优惠券已过期" : language == 2 ? "Coupon is expired." : "Le coupon a expiré.", "");
             }
             if(userCouponRecord.getCouponUseType() != 0 && userCouponRecord.getCouponUseType() != 1){
-                return ResultUtil.error("优惠券不能用于此类型订单", "");
+                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){
-                return ResultUtil.error("优惠券不能用于此订单", "");
+                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();
             orderPrivateCar.setCouponMoney(userCouponRecord.getMoney());
@@ -877,48 +931,60 @@
             orderPrivateCar.setRedPacketMoney(query.getMoney());
             orderPrivateCar.setRedPacketId(query.getId());
         }
-       //计算折扣
-        UserActivityDiscount1 query2 = userActivityDiscount1Mapper.query(orderPrivateCar.getCompanyId());
-        if(null != query2){
-            Integer orderNum=this.selectCount(new EntityWrapper<OrderPrivateCar>().eq("userId",orderPrivateCar.getUserId()).eq("activityId",query2.getId()).last(" and to_days(getoffTime) = to_days(now())"));
-            if(query2.getDistance()*1000>orderPrivateCar.getMileage() && query2.getOrderNum()>orderNum){
-                Double special = query2.getSpecial();
-                orderPrivateCar.setDiscount(special);
-                double v = new BigDecimal(orderMoney).multiply(new BigDecimal(special / 10)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
-                if(orderMoney.compareTo(v) > 0){
-                    orderPrivateCar.setDiscountMoney(orderMoney - v);
-                    orderPrivateCar.setActivityId(query2.getId());
-                    orderMoney = v;
-                }
-            }
-
-        }
 
         if(payType == 1){//手机支付
-            //Map<String, String> map = icbcPayUtil.placeAnOrder(orderId + ",1", 9, 5, uid.toString(), "完成订单", orderMoney, callbackPath + "/base/wxPayOrderTaxi", "", type, userInfo.getAppletsOpenId());
-            resultUtil =  payMoneyUtil.weixinpay("完成订单",orderId +"",orderId + "_1_fei",orderMoney+"","/base/wxPayOrderTaxi","JSAPI",userInfo.getAppletsOpenId());
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
+            String merchantTransactionId = sdf.format(new Date()) + "1" + language + orderId;
+            CheckoutRequest checkoutRequest = new CheckoutRequest();
+            checkoutRequest.setMsisdn(Long.valueOf(userInfo.getPhone()));
+            checkoutRequest.setCustomerEmail(userInfo.getEmail());
+            checkoutRequest.setAccountNumber(userInfo.getPhone());
+            checkoutRequest.setCustomerFirstName(userInfo.getFirstName());
+            checkoutRequest.setCustomerLastName(userInfo.getLastName());
+            checkoutRequest.setRequestAmount(orderMoney);
+            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");
+            resultUtil = TinggPayUtil.checkoutRequest(checkoutRequest);
 
             if(resultUtil.getCode()==200){
                 paymentRecordService.saveData(1, null, null, orderId, 1, 1, orderMoney, null, 1);//添加预支付数据
-                resultUtil = resultUtil;
             }else{
-                resultUtil = ResultUtil.error("支付失败", "");
+                resultUtil = ResultUtil.error(language == 1 ? "支付失败" : language == 2 ? "Payment failure" : "Paiement échoué", "");
             }
 
         }
-        if(payType == 2) {//银行卡支付
-            resultUtil =  payMoneyUtil.alipay("完成订单","完成订单",orderId + "_1_fei",orderMoney+"","/base/aliPayOrderTaxi");
-            //Map<String, String> map = icbcPayUtil.placeAnOrder(orderId + ",1", 10, 5, uid.toString(), "完成订单", orderMoney, callbackPath + "/base/aliPayOrderTaxi", "", type, null);
-            if (resultUtil.getCode()==200) {
+        if(payType == 2){//银行卡支付
+            BankCard bankCard = bankCardService.selectById(bankCardId);
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
+            String merchantTransactionId = sdf.format(new Date()) + "1" + language + orderId;
+            CheckoutRequest checkoutRequest = new CheckoutRequest();
+            checkoutRequest.setMsisdn(Long.valueOf(bankCard.getCode()));
+            checkoutRequest.setCustomerEmail(userInfo.getEmail());
+            checkoutRequest.setAccountNumber(bankCard.getCode());
+            checkoutRequest.setCustomerFirstName(bankCard.getFirstName());
+            checkoutRequest.setCustomerLastName(bankCard.getLastName());
+            checkoutRequest.setRequestAmount(orderMoney);
+            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");
+            resultUtil = TinggPayUtil.checkoutRequest(checkoutRequest);
+
+            if(resultUtil.getCode()==200){
                 paymentRecordService.saveData(1, null, null, orderId, 1, 2, orderMoney, null, 1);//添加预支付数据
-                resultUtil = resultUtil;
-            } else {
-                resultUtil = ResultUtil.error("支付失败", "");
+            }else{
+                resultUtil = ResultUtil.error(language == 1 ? "支付失败" : language == 2 ? "Payment failure" : "Paiement échoué", "");
             }
         }
         if(payType == 3){//余额支付
             if(userInfo.getBalance() == null || userInfo.getBalance() < orderMoney){
-                return ResultUtil.error("余额不足，无法完成支付", "");
+                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());
@@ -958,7 +1024,7 @@
                 }
                 if(company.getIsSpeFixedOrProportional() == 1){//比例
                     Double price = orderPrivateCar.getStartMoney() + orderPrivateCar.getMileageMoney() + orderPrivateCar.getWaitMoney() + orderPrivateCar.getDurationMoney() + orderPrivateCar.getLongDistanceMoney();
-                    d = new BigDecimal(price).multiply(new BigDecimal(speMoney).divide(new BigDecimal(100))).setScale(2, BigDecimal.ROUND_HALF_EVEN);
+                    d = new BigDecimal(price).multiply(new BigDecimal(speMoney).divide(new BigDecimal(100), new MathContext(2, RoundingMode.HALF_EVEN)));
                     c = new BigDecimal(orderPrivateCar.getOrderMoney()).subtract(d).setScale(2, BigDecimal.ROUND_HALF_EVEN);
                 }
                 incomeService.saveData(1, orderPrivateCar.getCompanyId(), 2, orderPrivateCar.getId(), 1, d.doubleValue());
@@ -970,6 +1036,281 @@
                 driverService.updateById(driver);
             }
 
+            if(ToolUtil.isNotEmpty(userInfo.getEmail())){
+                new Thread(new Runnable() {
+                    @Override
+                    public void run() {
+                        try {
+                            String path = templatePath +  "user/receipt.html";
+                            Document document = Jsoup.parse(new File(path), "UTF-8");
+                            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+                            SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+                            SimpleDateFormat sdf2 = new SimpleDateFormat("HH:mm");
+                            Car car = carMapper.selectById(orderPrivateCar.getCarId());
+                            Driver driver = driverService.selectById(orderPrivateCar.getDriverId());
+                            Double aDouble = 0D;
+                            if(null != orderPrivateCar.getDriverId()){
+                                aDouble = orderEvaluateService.queryDriverScore(orderPrivateCar.getDriverId());
+                            }
+                            Double aDouble1 = Double.valueOf(orderPrivateCar.getMileage() / 1000);
+                            if(1 == language){
+                                document.getElementById("english").remove();
+                                document.getElementById("french").remove();
+                                document.getElementsByTag("title").get(0).text("I-GO电子收据");
+                                Element title_chinese = document.getElementById("title_chinese");
+                                title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，您在I-GO此订单消费GHS " + orderPrivateCar.getPayMoney());
+                                Element xcf_chinese = document.getElementById("xcf_chinese");
+                                xcf_chinese.text("GHS " + orderPrivateCar.getOrderMoney());
+                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
+                                    Element yhq_chinese = document.getElementById("yhq_chinese");
+                                    yhq_chinese.text("GHS -" + orderPrivateCar.getCouponMoney());
+                                }else{
+                                    Element yhq_chinese_div = document.getElementById("yhq_chinese_div");
+                                    yhq_chinese_div.remove();
+                                }
+                                if(null != orderPrivateCar.getDiscountMoney() && orderPrivateCar.getDiscountMoney() > 0){
+                                    Element zk_chinese = document.getElementById("zk_chinese");
+                                    zk_chinese.text("GHS -" + orderPrivateCar.getDiscountMoney());
+                                }else{
+                                    Element zk_chinese_div = document.getElementById("zk_chinese_div");
+                                    zk_chinese_div.remove();
+                                }
+                                if(null != orderPrivateCar.getRedPacketMoney() && orderPrivateCar.getRedPacketMoney() > 0){
+                                    Element hb_chinese = document.getElementById("hb_chinese");
+                                    hb_chinese.text("GHS -" + orderPrivateCar.getRedPacketMoney());
+                                }else{
+                                    Element hb_chinese_div = document.getElementById("hb_chinese_div");
+                                    hb_chinese_div.remove();
+                                }
+                                Element xj_chinese = document.getElementById("xj_chinese");
+                                xj_chinese.text("GHS " + orderPrivateCar.getPayMoney());
+                                Element pay_type_chinese = document.getElementById("pay_type_chinese");
+                                pay_type_chinese.text("余额支付");
+                                Element pay_money_chinese = document.getElementById("pay_money_chinese");
+                                pay_money_chinese.text("GHS " + orderPrivateCar.getPayMoney());
+                                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");
+                                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");
+                                Element track_chinese = document.getElementById("track_chinese");
+                                track_chinese.attr("href", "http://182.160.16.251:81/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");
+                                for (int i = 0; i < driver_chinese.size(); i++) {
+                                    Element element = driver_chinese.get(i);
+                                    element.text(driver.getFirstName() + "." + driver.getLastName());
+                                }
+                                Element cp_chinese = document.getElementById("cp_chinese");
+                                cp_chinese.text("车牌：" + car.getCarLicensePlate());
+                                Element pf_chinese = document.getElementById("pf_chinese");
+                                pf_chinese.text("司机评分：" + aDouble);
+                                Element lc_chinese = document.getElementById("lc_chinese");
+                                lc_chinese.text("里程：" + aDouble1 + "公里 /" + orderPrivateCar.getDuration() + "分钟");
+                                Element start_time_chinese = document.getElementById("start_time_chinese");
+                                start_time_chinese.text(sdf2.format(orderPrivateCar.getTravelTime()));
+                                Element start_address_chinese = document.getElementById("start_address_chinese");
+                                start_address_chinese.text(orderPrivateCar.getStartAddress());
+                                Element end_time_chinese = document.getElementById("end_time_chinese");
+                                end_time_chinese.text(sdf2.format(orderPrivateCar.getEndServiceTime()));
+                                Element end_address_chinese = document.getElementById("end_address_chinese");
+                                end_address_chinese.text(orderPrivateCar.getEndAddress());
+                                Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId()));
+                                Element server_tel_chinese = document.getElementById("server_tel_chinese");
+                                server_tel_chinese.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
+                            }
+                            if(2 == language){
+                                document.getElementById("chinese").remove();
+                                document.getElementById("french").remove();
+                                document.getElementsByTag("title").get(0).text("Receipt");
+                                Element title_english = document.getElementById("title_english");
+                                title_english.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，You spent GHS " + orderPrivateCar.getPayMoney() + " on the trip ");
+                                Element xcf_english = document.getElementById("xcf_english");
+                                xcf_english.text("GHS " + orderPrivateCar.getOrderMoney());
+                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
+                                    Element yhq_english = document.getElementById("yhq_english");
+                                    yhq_english.text("GHS -" + orderPrivateCar.getCouponMoney());
+                                }else{
+                                    Element yhq_english_div = document.getElementById("yhq_english_div");
+                                    yhq_english_div.remove();
+                                }
+                                if(null != orderPrivateCar.getDiscountMoney() && orderPrivateCar.getDiscountMoney() > 0){
+                                    Element zk_english = document.getElementById("zk_english");
+                                    zk_english.text("GHS -" + orderPrivateCar.getDiscountMoney());
+                                }else{
+                                    Element zk_english_div = document.getElementById("zk_english_div");
+                                    zk_english_div.remove();
+                                }
+                                if(null != orderPrivateCar.getRedPacketMoney() && orderPrivateCar.getRedPacketMoney() > 0){
+                                    Element hb_english = document.getElementById("hb_english");
+                                    hb_english.text("GHS -" + orderPrivateCar.getRedPacketMoney());
+                                }else{
+                                    Element hb_english_div = document.getElementById("hb_english_div");
+                                    hb_english_div.remove();
+                                }
+                                Element xj_english = document.getElementById("xj_english");
+                                xj_english.text("GHS " + orderPrivateCar.getPayMoney());
+                                Element pay_type_english = document.getElementById("pay_type_english");
+                                pay_type_english.text("I-GO Wallet");
+                                Element pay_money_english = document.getElementById("pay_money_english");
+                                pay_money_english.text("GHS " + orderPrivateCar.getPayMoney());
+                                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");
+                                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");
+                                Element track_english = document.getElementById("track_english");
+                                track_english.attr("href", "http://182.160.16.251:81/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");
+                                for (int i = 0; i < driver_english.size(); i++) {
+                                    Element element = driver_english.get(i);
+                                    element.text(driver.getFirstName() + "." + driver.getLastName());
+                                }
+                                Element cp_english = document.getElementById("cp_english");
+                                cp_english.text("Number Plate：" + car.getCarLicensePlate());
+                                Element pf_english = document.getElementById("pf_english");
+                                pf_english.text("Driver Rating：" + aDouble);
+                                Element lc_english = document.getElementById("lc_english");
+                                lc_english.text("Mileage：" + aDouble1 + "KM / " + orderPrivateCar.getDuration() + "Minutes");
+                                Element start_time_english = document.getElementById("start_time_english");
+                                start_time_english.text(sdf2.format(orderPrivateCar.getTravelTime()));
+                                Element start_address_english = document.getElementById("start_address_english");
+                                start_address_english.text(orderPrivateCar.getStartAddress());
+                                Element end_time_english = document.getElementById("end_time_english");
+                                end_time_english.text(sdf2.format(orderPrivateCar.getEndServiceTime()));
+                                Element end_address_english = document.getElementById("end_address_english");
+                                end_address_english.text(orderPrivateCar.getEndAddress());
+                                Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId()));
+                                Element server_tel_english = document.getElementById("server_tel_english");
+                                server_tel_english.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
+                            }
+                            if(3 == language){
+                                document.getElementById("chinese").remove();
+                                document.getElementById("english").remove();
+                                document.getElementsByTag("title").get(0).text("Reçu");
+                                Element title_french = document.getElementById("title_french");
+                                title_french.text("Le " + DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + ", vous avez dépensé GHS " + orderPrivateCar.getPayMoney() + " sur le voyage");
+                                Element xcf_french = document.getElementById("xcf_french");
+                                xcf_french.text("GHS " + orderPrivateCar.getOrderMoney());
+                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
+                                    Element yhq_french = document.getElementById("yhq_french");
+                                    yhq_french.text("GHS -" + orderPrivateCar.getCouponMoney());
+                                }else{
+                                    Element yhq_french_div = document.getElementById("yhq_french_div");
+                                    yhq_french_div.remove();
+                                }
+                                if(null != orderPrivateCar.getDiscountMoney() && orderPrivateCar.getDiscountMoney() > 0){
+                                    Element zk_french = document.getElementById("zk_french");
+                                    zk_french.text("GHS -" + orderPrivateCar.getDiscountMoney());
+                                }else{
+                                    Element zk_french_div = document.getElementById("zk_french_div");
+                                    zk_french_div.remove();
+                                }
+                                if(null != orderPrivateCar.getRedPacketMoney() && orderPrivateCar.getRedPacketMoney() > 0){
+                                    Element hb_french = document.getElementById("hb_french");
+                                    hb_french.text("GHS -" + orderPrivateCar.getRedPacketMoney());
+                                }else{
+                                    Element hb_french_div = document.getElementById("hb_french_div");
+                                    hb_french_div.remove();
+                                }
+                                Element xj_french = document.getElementById("xj_french");
+                                xj_french.text("GHS " + orderPrivateCar.getPayMoney());
+                                Element pay_type_french = document.getElementById("pay_type_french");
+                                pay_type_french.text("Portefeuille I-GO");
+                                Element pay_money_french = document.getElementById("pay_money_french");
+                                pay_money_french.text("GHS " + orderPrivateCar.getPayMoney());
+                                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");
+                                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");
+                                Element track_french = document.getElementById("track_french");
+                                track_french.attr("href", "http://182.160.16.251:81/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");
+                                for (int i = 0; i < driver_french.size(); i++) {
+                                    Element element = driver_french.get(i);
+                                    element.text(driver.getFirstName() + "." + driver.getLastName());
+                                }
+                                Element cp_french = document.getElementById("cp_french");
+                                cp_french.text("Plaque: GS " + car.getCarLicensePlate());
+                                Element pf_french = document.getElementById("pf_french");
+                                pf_french.text("Note du chauffeur: " + aDouble);
+                                Element lc_french = document.getElementById("lc_french");
+                                lc_french.text("Distance: " + aDouble1 + "km / " + orderPrivateCar.getDuration() + "minutes");
+                                Element start_time_french = document.getElementById("start_time_french");
+                                start_time_french.text(sdf2.format(orderPrivateCar.getTravelTime()));
+                                Element start_address_french = document.getElementById("start_address_french");
+                                start_address_french.text(orderPrivateCar.getStartAddress());
+                                Element end_time_french = document.getElementById("end_time_french");
+                                end_time_french.text(sdf2.format(orderPrivateCar.getEndServiceTime()));
+                                Element end_address_french = document.getElementById("end_address_french");
+                                end_address_french.text(orderPrivateCar.getEndAddress());
+                                Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId()));
+                                Element server_tel_french = document.getElementById("server_tel_french");
+                                server_tel_french.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
+                            }
+                            EmailUtil.send(userInfo.getEmail(), language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu",  document.html());
+
+                            //开始生成pdf收据和html收据
+                            File file = new File("/usr/local/nginx/html/files/html/");
+                            if(!file.exists()){
+                                file.mkdirs();
+                            }
+                            file = new File("/usr/local/nginx/html/files/html/ride_receipt_" + orderId + ".html");
+                            if(!file.exists()){
+                                file.createNewFile();
+                            }
+                            FileWriter fileWriter = new FileWriter(file);
+                            fileWriter.write(document.html());
+                            fileWriter.flush();
+                            fileWriter.close();
+
+                            File file1 = new File("/usr/local/nginx/html/files/pdf/");
+                            if(!file1.exists()){
+                                file1.mkdirs();
+                            }
+                            file1 = new File("/usr/local/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);
+                            }catch (Exception e){
+                                e.printStackTrace();
+                                System.out.println("html转pdf异常");
+                            }
+
+                            String link ="http://182.160.16.251:81/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.setType(1);
+                            tEmail.setOrderId(orderId);
+                            tEmail.setCreateTime(new Date());
+                            int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
+                            tEmail.setWeek(EmailUtil.getWeek(language,i));
+                            boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
+                            if(am){
+                                tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
+                            }else {
+                                tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
+                            }
+                            emailService.insert(tEmail);
+
+
+
+                        }catch (Exception e){
+                            e.printStackTrace();
+                        }
+                    }
+                }).start();
+            }
+
+
 
             // TODO: 2020/5/24 这里需要给司机和用户推送订单状态
             new Thread(new Runnable() {
@@ -980,7 +1321,9 @@
                 }
             }).start();
 
-            systemNoticeService.addSystemNotice(1, "您已使用余额成功完成出行订单支付，谢谢使用！", uid, 1);
+            systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功完成出行订单支付，谢谢使用！" : language == 2
+                    ? "You've paid for the ride order successfully, thank you for using I-GO"
+                    : "Vous avez payé la commande de course avec succès, merci d’utiliser I-GO", orderPrivateCar.getUserId(), 1);
         }
 
 
@@ -994,7 +1337,7 @@
 
             orderPrivateCar.setState(8);
             orderPrivateCar.setPayType(4);
-            orderPrivateCar.setDriverPay(1);
+            orderPrivateCar.setDriverPay(2);
             orderPrivateCar.setPayMoney(orderMoney);
             orderPrivateCar.setOrderMoney(orderPrivateCar.getOrderMoney()+orderPrivateCar.getFreeMoney().doubleValue());
 
@@ -1021,17 +1364,330 @@
                 }
                 if(company.getIsSpeFixedOrProportional() == 1){//比例
                     Double price = orderPrivateCar.getStartMoney() + orderPrivateCar.getMileageMoney() + orderPrivateCar.getWaitMoney() + orderPrivateCar.getDurationMoney() + orderPrivateCar.getLongDistanceMoney();
-                    d = new BigDecimal(price).multiply(new BigDecimal(speMoney).divide(new BigDecimal(100))).setScale(2, BigDecimal.ROUND_HALF_EVEN);
+                    d = new BigDecimal(price).multiply(new BigDecimal(speMoney).divide(new BigDecimal(100), new MathContext(2, RoundingMode.HALF_EVEN)));
                     c = new BigDecimal(orderPrivateCar.getOrderMoney()).subtract(d).setScale(2, BigDecimal.ROUND_HALF_EVEN);
                 }
-                incomeService.saveData(1, orderPrivateCar.getCompanyId(), 2, orderPrivateCar.getId(), 1, d.doubleValue());
-                incomeService.saveData(2, orderPrivateCar.getDriverId(), 2, orderPrivateCar.getId(), 1, c.doubleValue());
+//                incomeService.saveData(1, orderPrivateCar.getCompanyId(), 2, orderPrivateCar.getId(), 1, d.doubleValue());
+//                incomeService.saveData(2, orderPrivateCar.getDriverId(), 2, orderPrivateCar.getId(), 1, c.doubleValue());
                 Driver driver = driverService.selectById(orderPrivateCar.getDriverId());
-                driver.setBusinessMoney(new BigDecimal(null != driver.getBusinessMoney() ? driver.getBusinessMoney() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
-                driver.setLaveBusinessMoney(new BigDecimal(null != driver.getLaveBusinessMoney() ? driver.getLaveBusinessMoney() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
-                driver.setBalance(new BigDecimal(null != driver.getBalance() ? driver.getBalance() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
-                driverService.updateById(driver);
+//                driver.setBusinessMoney(new BigDecimal(null != driver.getBusinessMoney() ? driver.getBusinessMoney() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+//                driver.setLaveBusinessMoney(new BigDecimal(null != driver.getLaveBusinessMoney() ? driver.getLaveBusinessMoney() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+//                driver.setBalance(new BigDecimal(null != driver.getBalance() ? driver.getBalance() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+//                driverService.updateById(driver);
+
+
+                //记录司机待结算金额
+                if(d.compareTo(new BigDecimal(0)) > 0){
+                    SettlementDetail settlementDetail = new SettlementDetail();
+                    settlementDetail.setOrderId(orderId);
+                    settlementDetail.setOrderType(1);
+                    settlementDetail.setDriverId(driver.getId());
+                    settlementDetail.setOrderMoney(orderPrivateCar.getOrderMoney());
+                    settlementDetail.setPrice(d.doubleValue());
+                    settlementDetail.setCreateTime(new Date());
+                    settlementDetailService.insert(settlementDetail);
+
+                    SettlementAllocation settlementAllocation = settlementAllocationService.selectOne(null);
+                    if(null != settlementAllocation){
+                        JSONObject jsonObject = JSON.parseObject(settlementAllocation.getContent());
+                        Double maxPrice = jsonObject.getDouble("maxPrice");
+                        List<SettlementDetail> settlementDetailList = settlementDetailService.selectList(new EntityWrapper<SettlementDetail>().eq("driverId", driver.getId()).isNull("settlementRecordId").last(" and DATE_FORMAT(now(), '%Y-%m-%d') = DATE_FORMAT(createTime, '%Y-%m-%d')"));
+                        BigDecimal total = new BigDecimal(0);
+                        for (SettlementDetail detail : settlementDetailList) {
+                            total = total.add(new BigDecimal(detail.getPrice()));
+                        }
+                        if(maxPrice.compareTo(total.doubleValue()) <= 0){
+                            SettlementRecord settlementRecord = new SettlementRecord();
+                            settlementRecord.setDay(new Date());
+                            settlementRecord.setDriverId(driver.getId());
+                            settlementRecord.setType(1);
+                            settlementRecord.setPaymentStatus(1);
+                            settlementRecord.setPayMoney(total.doubleValue());
+                            settlementRecord.setInsertTime(new Date());
+                            settlementRecordService.insert(settlementRecord);
+
+                            for (SettlementDetail detail : settlementDetailList) {
+                                detail.setSettlementRecordId(settlementRecord.getId());
+                                settlementDetailService.updateById(detail);
+                            }
+                        }
+                    }
+                }
             }
+
+            if(ToolUtil.isNotEmpty(userInfo.getEmail())){
+                new Thread(new Runnable() {
+                    @Override
+                    public void run() {
+                        try {
+                            String path = templatePath +  "user/receipt.html";
+                            Document document = Jsoup.parse(new File(path), "UTF-8");
+                            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+                            SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+                            SimpleDateFormat sdf2 = new SimpleDateFormat("HH:mm");
+                            Car car = carMapper.selectById(orderPrivateCar.getCarId());
+                            Double aDouble = 0D;
+                            if(null != orderPrivateCar.getDriverId()){
+                                aDouble = orderEvaluateService.queryDriverScore(orderPrivateCar.getDriverId());
+                            }
+                            Double aDouble1 = Double.valueOf(orderPrivateCar.getMileage() / 1000);
+                            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电子收据");
+                                Element title_chinese = document.getElementById("title_chinese");
+                                title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，您在I-GO此订单消费GHS " + orderPrivateCar.getPayMoney());
+                                Element xcf_chinese = document.getElementById("xcf_chinese");
+                                xcf_chinese.text("GHS " + orderPrivateCar.getOrderMoney());
+                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
+                                    Element yhq_chinese = document.getElementById("yhq_chinese");
+                                    yhq_chinese.text("GHS -" + orderPrivateCar.getCouponMoney());
+                                }else{
+                                    Element yhq_chinese_div = document.getElementById("yhq_chinese_div");
+                                    yhq_chinese_div.remove();
+                                }
+                                if(null != orderPrivateCar.getDiscountMoney() && orderPrivateCar.getDiscountMoney() > 0){
+                                    Element zk_chinese = document.getElementById("zk_chinese");
+                                    zk_chinese.text("GHS -" + orderPrivateCar.getDiscountMoney());
+                                }else{
+                                    Element zk_chinese_div = document.getElementById("zk_chinese_div");
+                                    zk_chinese_div.remove();
+                                }
+                                if(null != orderPrivateCar.getRedPacketMoney() && orderPrivateCar.getRedPacketMoney() > 0){
+                                    Element hb_chinese = document.getElementById("hb_chinese");
+                                    hb_chinese.text("GHS -" + orderPrivateCar.getRedPacketMoney());
+                                }else{
+                                    Element hb_chinese_div = document.getElementById("hb_chinese_div");
+                                    hb_chinese_div.remove();
+                                }
+                                Element xj_chinese = document.getElementById("xj_chinese");
+                                xj_chinese.text("GHS " + orderPrivateCar.getPayMoney());
+                                Element pay_type_chinese = document.getElementById("pay_type_chinese");
+                                pay_type_chinese.text("现金");
+                                Element pay_money_chinese = document.getElementById("pay_money_chinese");
+                                pay_money_chinese.text("GHS " + orderPrivateCar.getPayMoney());
+                                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");
+                                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");
+                                Element track_chinese = document.getElementById("track_chinese");
+                                track_chinese.attr("href", "http://182.160.16.251:81/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");
+                                for (int i = 0; i < driver_chinese.size(); i++) {
+                                    Element element = driver_chinese.get(i);
+                                    element.text(driver.getFirstName() + "." + driver.getLastName());
+                                }
+                                Element cp_chinese = document.getElementById("cp_chinese");
+                                cp_chinese.text("车牌：" + car.getCarLicensePlate());
+                                Element pf_chinese = document.getElementById("pf_chinese");
+                                pf_chinese.text("司机评分：" + aDouble);
+                                Element lc_chinese = document.getElementById("lc_chinese");
+                                lc_chinese.text("里程：" + aDouble1 + "公里 /" + orderPrivateCar.getDuration() + "分钟");
+                                Element start_time_chinese = document.getElementById("start_time_chinese");
+                                start_time_chinese.text(sdf2.format(orderPrivateCar.getTravelTime()));
+                                Element start_address_chinese = document.getElementById("start_address_chinese");
+                                start_address_chinese.text(orderPrivateCar.getStartAddress());
+                                Element end_time_chinese = document.getElementById("end_time_chinese");
+                                end_time_chinese.text(sdf2.format(orderPrivateCar.getEndServiceTime()));
+                                Element end_address_chinese = document.getElementById("end_address_chinese");
+                                end_address_chinese.text(orderPrivateCar.getEndAddress());
+                                Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId()));
+                                Element server_tel_chinese = document.getElementById("server_tel_chinese");
+                                server_tel_chinese.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
+                            }
+                            if(2 == language){
+                                document.getElementById("chinese").remove();
+                                document.getElementById("french").remove();
+                                document.getElementsByTag("title").get(0).text("Receipt");
+                                Element title_english = document.getElementById("title_english");
+                                title_english.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，You spent GHS " + orderPrivateCar.getPayMoney() + " on the trip ");
+                                Element xcf_english = document.getElementById("xcf_english");
+                                xcf_english.text("GHS " + orderPrivateCar.getOrderMoney());
+                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
+                                    Element yhq_english = document.getElementById("yhq_english");
+                                    yhq_english.text("GHS -" + orderPrivateCar.getCouponMoney());
+                                }else{
+                                    Element yhq_english_div = document.getElementById("yhq_english_div");
+                                    yhq_english_div.remove();
+                                }
+                                if(null != orderPrivateCar.getDiscountMoney() && orderPrivateCar.getDiscountMoney() > 0){
+                                    Element zk_english = document.getElementById("zk_english");
+                                    zk_english.text("GHS -" + orderPrivateCar.getDiscountMoney());
+                                }else{
+                                    Element zk_english_div = document.getElementById("zk_english_div");
+                                    zk_english_div.remove();
+                                }
+                                if(null != orderPrivateCar.getRedPacketMoney() && orderPrivateCar.getRedPacketMoney() > 0){
+                                    Element hb_english = document.getElementById("hb_english");
+                                    hb_english.text("GHS -" + orderPrivateCar.getRedPacketMoney());
+                                }else{
+                                    Element hb_english_div = document.getElementById("hb_english_div");
+                                    hb_english_div.remove();
+                                }
+                                Element xj_english = document.getElementById("xj_english");
+                                xj_english.text("GHS " + orderPrivateCar.getPayMoney());
+                                Element pay_type_english = document.getElementById("pay_type_english");
+                                pay_type_english.text("Cash");
+                                Element pay_money_english = document.getElementById("pay_money_english");
+                                pay_money_english.text("GHS " + orderPrivateCar.getPayMoney());
+                                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");
+                                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");
+                                Element track_english = document.getElementById("track_english");
+                                track_english.attr("href", "http://182.160.16.251:81/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");
+                                for (int i = 0; i < driver_english.size(); i++) {
+                                    Element element = driver_english.get(i);
+                                    element.text(driver.getFirstName() + "." + driver.getLastName());
+                                }
+                                Element cp_english = document.getElementById("cp_english");
+                                cp_english.text("Number Plate：" + car.getCarLicensePlate());
+                                Element pf_english = document.getElementById("pf_english");
+                                pf_english.text("Driver Rating：" + aDouble);
+                                Element lc_english = document.getElementById("lc_english");
+                                lc_english.text("Mileage：" + aDouble1 + "KM / " + orderPrivateCar.getDuration() + "Minutes");
+                                Element start_time_english = document.getElementById("start_time_english");
+                                start_time_english.text(sdf2.format(orderPrivateCar.getTravelTime()));
+                                Element start_address_english = document.getElementById("start_address_english");
+                                start_address_english.text(orderPrivateCar.getStartAddress());
+                                Element end_time_english = document.getElementById("end_time_english");
+                                end_time_english.text(sdf2.format(orderPrivateCar.getEndServiceTime()));
+                                Element end_address_english = document.getElementById("end_address_english");
+                                end_address_english.text(orderPrivateCar.getEndAddress());
+                                Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId()));
+                                Element server_tel_english = document.getElementById("server_tel_english");
+                                server_tel_english.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
+                            }
+                            if(3 == language){
+                                document.getElementById("chinese").remove();
+                                document.getElementById("english").remove();
+                                document.getElementsByTag("title").get(0).text("Reçu");
+                                Element title_french = document.getElementById("title_french");
+                                title_french.text("Le " + DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + ", vous avez dépensé GHS " + orderPrivateCar.getPayMoney() + " sur le voyage");
+                                Element xcf_french = document.getElementById("xcf_french");
+                                xcf_french.text("GHS " + orderPrivateCar.getOrderMoney());
+                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
+                                    Element yhq_french = document.getElementById("yhq_french");
+                                    yhq_french.text("GHS -" + orderPrivateCar.getCouponMoney());
+                                }else{
+                                    Element yhq_french_div = document.getElementById("yhq_french_div");
+                                    yhq_french_div.remove();
+                                }
+                                if(null != orderPrivateCar.getDiscountMoney() && orderPrivateCar.getDiscountMoney() > 0){
+                                    Element zk_french = document.getElementById("zk_french");
+                                    zk_french.text("GHS -" + orderPrivateCar.getDiscountMoney());
+                                }else{
+                                    Element zk_french_div = document.getElementById("zk_french_div");
+                                    zk_french_div.remove();
+                                }
+                                if(null != orderPrivateCar.getRedPacketMoney() && orderPrivateCar.getRedPacketMoney() > 0){
+                                    Element hb_french = document.getElementById("hb_french");
+                                    hb_french.text("GHS -" + orderPrivateCar.getRedPacketMoney());
+                                }else{
+                                    Element hb_french_div = document.getElementById("hb_french_div");
+                                    hb_french_div.remove();
+                                }
+                                Element xj_french = document.getElementById("xj_french");
+                                xj_french.text("GHS " + orderPrivateCar.getPayMoney());
+                                Element pay_type_french = document.getElementById("pay_type_french");
+                                pay_type_french.text("En espèces");
+                                Element pay_money_french = document.getElementById("pay_money_french");
+                                pay_money_french.text("GHS " + orderPrivateCar.getPayMoney());
+                                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");
+                                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");
+                                Element track_french = document.getElementById("track_french");
+                                track_french.attr("href", "http://182.160.16.251:81/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");
+                                for (int i = 0; i < driver_french.size(); i++) {
+                                    Element element = driver_french.get(i);
+                                    element.text(driver.getFirstName() + "." + driver.getLastName());
+                                }
+                                Element cp_french = document.getElementById("cp_french");
+                                cp_french.text("Plaque: GS " + car.getCarLicensePlate());
+                                Element pf_french = document.getElementById("pf_french");
+                                pf_french.text("Note du chauffeur: " + aDouble);
+                                Element lc_french = document.getElementById("lc_french");
+                                lc_french.text("Distance: " + aDouble1 + "km / " + orderPrivateCar.getDuration() + "minutes");
+                                Element start_time_french = document.getElementById("start_time_french");
+                                start_time_french.text(sdf2.format(orderPrivateCar.getTravelTime()));
+                                Element start_address_french = document.getElementById("start_address_french");
+                                start_address_french.text(orderPrivateCar.getStartAddress());
+                                Element end_time_french = document.getElementById("end_time_french");
+                                end_time_french.text(sdf2.format(orderPrivateCar.getEndServiceTime()));
+                                Element end_address_french = document.getElementById("end_address_french");
+                                end_address_french.text(orderPrivateCar.getEndAddress());
+                                Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId()));
+                                Element server_tel_french = document.getElementById("server_tel_french");
+                                server_tel_french.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
+                            }
+
+                            EmailUtil.send(userInfo.getEmail(), language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu",  document.html());
+
+                            //开始生成pdf收据和html收据
+                            File file = new File("/usr/local/nginx/html/files/html/");
+                            if(!file.exists()){
+                                file.mkdirs();
+                            }
+                            file = new File("/usr/local/nginx/html/files/html/ride_receipt_" + orderId + ".html");
+                            if(!file.exists()){
+                                file.createNewFile();
+                            }
+                            FileWriter fileWriter = new FileWriter(file);
+                            fileWriter.write(document.html());
+                            fileWriter.flush();
+                            fileWriter.close();
+
+                            File file1 = new File("/usr/local/nginx/html/files/pdf/");
+                            if(!file1.exists()){
+                                file1.mkdirs();
+                            }
+                            file1 = new File("/usr/local/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);
+                            }catch (Exception e){
+                                e.printStackTrace();
+                                System.out.println("html转pdf异常");
+                            }
+                            String link ="http://182.160.16.251:81/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.setType(1);
+                            tEmail.setOrderId(orderId);
+                            tEmail.setCreateTime(new Date());
+                            int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
+                            tEmail.setWeek(EmailUtil.getWeek(language,i));
+                            boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
+                            if(am){
+                                tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
+                            }else {
+                                tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
+                            }
+                            emailService.insert(tEmail);
+
+
+                        }catch (Exception e){
+                            e.printStackTrace();
+                        }
+                    }
+                }).start();
+            }
+
 
 
             // TODO: 2020/5/24 这里需要给司机和用户推送订单状态
@@ -1040,24 +1696,19 @@
                 public void run() {
                     pushUtil.pushOrderState(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0);
                     pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0);
+                    pushUtil.pushOfflinePayment(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1);
                 }
             }).start();
 
-            systemNoticeService.addSystemNotice(1, "您已使用现金成功完成出行订单支付，谢谢使用！", uid, 1);
+            systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功完成出行订单支付，谢谢使用！" : language == 2
+                    ? "You've paid for the ride order successfully, thank you for using I-GO"
+                    : "Vous avez payé la commande de course avec succès, merci d’utiliser I-GO", orderPrivateCar.getUserId(), 1);
         }
 
         this.updateAllColumnById(orderPrivateCar);
-
-        new Thread(new Runnable() {
-            @Override
-            public void run() {
-                if(pushMinistryOfTransport){//上传数据
-                    pushMinistryOfTransportUtil.operatePay(orderId);
-                }
-            }
-        }).start();
         return resultUtil;
     }
+
 
     @Override
     public synchronized ResultUtil<BaseWarpper> queryRedMoney(Integer orderId) throws Exception {
@@ -1109,7 +1760,7 @@
     }
 
     @Override
-    public synchronized ResultUtil shareRedEnvelope(Integer orderId) throws Exception {
+    public synchronized ResultUtil shareRedEnvelope(Integer orderId, Integer language) throws Exception {
         OrderPrivateCar orderPrivateCar = this.selectById(orderId);
         UserRedPacketRecord query = userRedPacketRecordService.query_(orderPrivateCar.getUserId(), orderPrivateCar.getCompanyId(), 0, 1, null);
         if(null != query){
@@ -1117,11 +1768,11 @@
             Map<String, Object> map = userActivityRedenvelopeService.query(orderPrivateCar.getCompanyId(), orderPrivateCar.getTravelTime());
             Double laveMoney = Double.valueOf(String.valueOf(map.get("laveMoney")));
             if(money.compareTo(laveMoney) > 0){
-                return ResultUtil.error("手速太慢了，红包已派发完啦！");
+                return ResultUtil.error(language == 1 ? "手速太慢了，红包已派发完啦！" : language == 2 ? "Too slow, all the lucky-promo has been distributed!" : "Trop lent, toute la promo chanceuse a été distribuée !");
             }
             //判断当前红包是否大于剩余可领取总金额
             if(money.compareTo(Double.valueOf(map.get("lavePrice").toString())) > 0){
-                return ResultUtil.error("手速太慢了，红包已派发完啦！");
+                return ResultUtil.error(language == 1 ? "手速太慢了，红包已派发完啦！" : language == 2 ? "Too slow, all the lucky-promo has been distributed!" : "Trop lent, toute la promo chanceuse a été distribuée !");
             }
             double v = new BigDecimal(laveMoney).subtract(new BigDecimal(money)).doubleValue();
 
@@ -1133,6 +1784,75 @@
             query.setState(1);
             query.setRedPacketActivityId(id.getId());
             userRedPacketRecordService.updateById(query);
+
+            UserInfo userInfo = userInfoService.selectById(orderPrivateCar.getUserId());
+            if(ToolUtil.isNotEmpty(userInfo.getEmail())){
+                String path = templatePath +  "user/redEnvelopes.html";
+                Document document = Jsoup.parse(new File(path), "UTF-8");
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+                if(1 == language){
+                    document.getElementById("english").remove();
+                    document.getElementById("french").remove();
+                    document.getElementsByTag("title").get(0).text("红包活动");
+                    Element user_chinese = document.getElementById("user_chinese");
+                    user_chinese.text("您好 " + userInfo.getNickName() + "，");
+                    Element time_chinese = document.getElementById("time_chinese");
+                    time_chinese.text("此活动有效期在 " + DateUtil.conversionFormat(language, sdf.format(query.getInsertTime())) + " 至 " + DateUtil.conversionFormat(language, sdf.format(query.getExpirationTime())) + "，详情请查看I-GO平台");
+                }
+                if(2 == language){
+                    document.getElementById("chinese").remove();
+                    document.getElementById("french").remove();
+                    document.getElementsByTag("title").get(0).text("Lucky-promo activities");
+                    Element user_english = document.getElementById("user_english");
+                    user_english.text("Hello " + userInfo.getNickName() + "，");
+                    Element time_english = document.getElementById("time_english");
+                    time_english.text("You could use it from " + DateUtil.conversionFormat(language, sdf.format(query.getInsertTime())) + " to " + DateUtil.conversionFormat(language, sdf.format(query.getExpirationTime())) + "，check more details on the app.");
+                }
+                if(3 == language){
+                    document.getElementById("chinese").remove();
+                    document.getElementById("english").remove();
+                    document.getElementsByTag("title").get(0).text("Activités bonus");
+                    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(query.getInsertTime())) + " au " + DateUtil.conversionFormat(language, sdf.format(query.getExpirationTime())) + ". 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/");
+                if(!file.exists()){
+                    file.mkdirs();
+                }
+                file = new File("/usr/local/nginx/html/files/html/redpacket_" + orderId + ".html");
+                if(!file.exists()){
+                    file.createNewFile();
+                }
+                FileWriter fileWriter = new FileWriter(file);
+                fileWriter.write(document.html());
+                fileWriter.flush();
+                fileWriter.close();
+
+                String link ="http://182.160.16.251:81/files/html/redpacket_" + orderId + ".html";
+                TEmail tEmail = new TEmail();
+                tEmail.setLink(link);
+                tEmail.setUserId(userInfo.getId());
+                tEmail.setType(1);
+                tEmail.setName(language == 1 ? "红包活动" : language == 2 ? "Lucky-promo activities" : "Activités bonus");
+                tEmail.setOrderId(orderId);
+                tEmail.setCreateTime(new Date());
+                int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
+                tEmail.setWeek(EmailUtil.getWeek(language,i));
+                boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
+                if(am){
+                    tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
+                }else {
+                    tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
+                }
+                emailService.insert(tEmail);
+
+            }
+
         }
         return ResultUtil.success();
     }
@@ -1142,13 +1862,12 @@
      * 取消订单支付后的处理
      * @param id            订单=id
      * @param order_id      工行支付单号
-     * @param type          1=微信，2=支付宝
      * @throws Exception
      */
     @Override
-    public void payCancelOrderPrivateCar(Integer id, String order_id, Integer type) throws Exception {
+    public void payCancelOrderPrivateCar(Integer id, String order_id, Integer language) throws Exception {
         OrderPrivateCar orderPrivateCar = this.selectById(id);
-        PaymentRecord query = paymentRecordService.query(1, null, null, Integer.valueOf(id), 1, type, 1);
+        PaymentRecord query = paymentRecordService.query(1, null, null, Integer.valueOf(id), 1, null, 1);
         if(null != query){
             //添加交易明细
             transactionDetailsService.saveData(orderPrivateCar.getUserId(), "取消订单", query.getAmount(), 2, 1, 1, 1, query.getOrderId());
@@ -1171,11 +1890,11 @@
                 orderCancelService.updateById(query1);
             }
 
-            //添加已收入明细
-            incomeService.saveData(1, orderPrivateCar.getCompanyId(), 3, orderPrivateCar.getId(), 1, query.getAmount());
-            //添加已收入明细
-            Company company = companyService.selectById(orderPrivateCar.getCompanyId());
-            Double taxi = company.getSpeMoney();
+//            //添加已收入明细
+//            incomeService.saveData(1, orderPrivateCar.getCompanyId(), 3, orderPrivateCar.getId(), 1, query.getAmount());
+//            //添加已收入明细
+//            Company company = companyService.selectById(orderPrivateCar.getCompanyId());
+//            Double taxi = company.getSpeMoney();
             BigDecimal c =new BigDecimal(query.getAmount());//司机收入
             incomeService.saveData(2, orderPrivateCar.getDriverId(), 3, orderPrivateCar.getId(), 1, c.doubleValue());
             Driver driver = driverService.selectById(orderPrivateCar.getDriverId());
@@ -1194,21 +1913,23 @@
 //            }).start();
 
             //添加消息
-            systemNoticeService.addSystemNotice(1, "您已使用" + (type == 1 ? "微信" : "支付宝") + "成功支付取消订单费用，谢谢使用！", orderPrivateCar.getUserId(), 1);
+            systemNoticeService.addSystemNotice(1, language == 1 ? "您已使用余额成功支付取消订单费用，谢谢使用！" : language == 2
+                    ? "You've paid for cancellation fee with the balance successfully, thank you for using I-GO"
+                    : "Vous avez utilisé avec succès votre solde pour payer les frais d’annulation, merci d’utiliser I-GO", orderPrivateCar.getUserId(), 1);
         }else{
             System.err.println("预支付数据异常（orderId = "  + id + ")");
         }
     }
 
     @Override
-    public void payOrderPrivateCarCallback(Integer id, String order_id, Integer type) throws Exception {
+    public void payOrderPrivateCarCallback(Integer id, String order_id, Integer language) throws Exception {
         OrderPrivateCar orderPrivateCar = this.selectById(id);
-        PaymentRecord query = paymentRecordService.query(1, null, null, Integer.valueOf(id), 1, type, 1);
+        PaymentRecord query = paymentRecordService.query(1, null, null, id, 1, null, 1);
         if(null != query){
             //添加交易明细
             transactionDetailsService.saveData(orderPrivateCar.getUserId(), "完成订单", query.getAmount(), 2, 1, 1, 1, query.getOrderId());
             orderPrivateCar.setState(8);
-            orderPrivateCar.setPayType(type);
+            orderPrivateCar.setPayType(query.getPayType());
             orderPrivateCar.setOrderMoney(orderPrivateCar.getOrderMoney()+orderPrivateCar.getFreeMoney().doubleValue());
             orderPrivateCar.setPayMoney(query.getAmount());
             this.updateById(orderPrivateCar);
@@ -1248,7 +1969,7 @@
                 }
                 if(company.getIsSpeFixedOrProportional() == 1){//比例
                     Double price = orderPrivateCar.getStartMoney() + orderPrivateCar.getMileageMoney() + orderPrivateCar.getWaitMoney() + orderPrivateCar.getDurationMoney() + orderPrivateCar.getLongDistanceMoney();
-                    d = new BigDecimal(price).multiply(new BigDecimal(taxi).divide(new BigDecimal(100))).setScale(2, BigDecimal.ROUND_HALF_EVEN);
+                    d = new BigDecimal(price).multiply(new BigDecimal(taxi).divide(new BigDecimal(100), new MathContext(2, RoundingMode.HALF_EVEN)));
                     c = new BigDecimal(orderPrivateCar.getOrderMoney()).subtract(d).setScale(2, BigDecimal.ROUND_HALF_EVEN);
                 }
                 incomeService.saveData(1, orderPrivateCar.getCompanyId(), 2, orderPrivateCar.getId(), 1, d.doubleValue());
@@ -1259,6 +1980,283 @@
                 driver.setBalance(new BigDecimal(null != driver.getBalance() ? driver.getBalance() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
                 driverService.updateById(driver);
             }
+
+
+            if(ToolUtil.isNotEmpty(userInfo.getEmail())){
+                new Thread(new Runnable() {
+                    @Override
+                    public void run() {
+                        try {
+                            String path = templatePath +  "user/receipt.html";
+                            Document document = Jsoup.parse(new File(path), "UTF-8");
+                            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+                            SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+                            SimpleDateFormat sdf2 = new SimpleDateFormat("HH:mm");
+                            Car car = carMapper.selectById(orderPrivateCar.getCarId());
+                            Driver driver = driverService.selectById(orderPrivateCar.getDriverId());
+                            Double aDouble = 0D;
+                            if(null != orderPrivateCar.getDriverId()){
+                                aDouble = orderEvaluateService.queryDriverScore(orderPrivateCar.getDriverId());
+                            }
+                            Double aDouble1 = Double.valueOf(orderPrivateCar.getMileage() / 1000);
+                            if(1 == language){
+                                document.getElementById("english").remove();
+                                document.getElementById("french").remove();
+                                document.getElementsByTag("title").get(0).text("I-GO电子收据");
+                                Element title_chinese = document.getElementById("title_chinese");
+                                title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，您在I-GO此订单消费GHS " + orderPrivateCar.getPayMoney());
+                                Element xcf_chinese = document.getElementById("xcf_chinese");
+                                xcf_chinese.text("GHS " + orderPrivateCar.getOrderMoney());
+                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
+                                    Element yhq_chinese = document.getElementById("yhq_chinese");
+                                    yhq_chinese.text("GHS -" + orderPrivateCar.getCouponMoney());
+                                }else{
+                                    Element yhq_chinese_div = document.getElementById("yhq_chinese_div");
+                                    yhq_chinese_div.remove();
+                                }
+                                if(null != orderPrivateCar.getDiscountMoney() && orderPrivateCar.getDiscountMoney() > 0){
+                                    Element zk_chinese = document.getElementById("zk_chinese");
+                                    zk_chinese.text("GHS -" + orderPrivateCar.getDiscountMoney());
+                                }else{
+                                    Element zk_chinese_div = document.getElementById("zk_chinese_div");
+                                    zk_chinese_div.remove();
+                                }
+                                if(null != orderPrivateCar.getRedPacketMoney() && orderPrivateCar.getRedPacketMoney() > 0){
+                                    Element hb_chinese = document.getElementById("hb_chinese");
+                                    hb_chinese.text("GHS -" + orderPrivateCar.getRedPacketMoney());
+                                }else{
+                                    Element hb_chinese_div = document.getElementById("hb_chinese_div");
+                                    hb_chinese_div.remove();
+                                }
+                                Element xj_chinese = document.getElementById("xj_chinese");
+                                xj_chinese.text("GHS " + orderPrivateCar.getPayMoney());
+                                Element pay_type_chinese = document.getElementById("pay_type_chinese");
+                                pay_type_chinese.text(orderPrivateCar.getPayType() == 1 ? "手机支付" : "银行卡支付");
+                                Element pay_money_chinese = document.getElementById("pay_money_chinese");
+                                pay_money_chinese.text("GHS " + orderPrivateCar.getPayMoney());
+                                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");
+                                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");
+                                Element track_chinese = document.getElementById("track_chinese");
+                                track_chinese.attr("href", "http://182.160.16.251:81/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");
+                                for (int i = 0; i < driver_chinese.size(); i++) {
+                                    Element element = driver_chinese.get(i);
+                                    element.text(driver.getFirstName() + "." + driver.getLastName());
+                                }
+                                Element cp_chinese = document.getElementById("cp_chinese");
+                                cp_chinese.text("车牌：" + car.getCarLicensePlate());
+                                Element pf_chinese = document.getElementById("pf_chinese");
+                                pf_chinese.text("司机评分：" + aDouble);
+                                Element lc_chinese = document.getElementById("lc_chinese");
+                                lc_chinese.text("里程：" + aDouble1 + "公里 /" + orderPrivateCar.getDuration() + "分钟");
+                                Element start_time_chinese = document.getElementById("start_time_chinese");
+                                start_time_chinese.text(sdf2.format(orderPrivateCar.getTravelTime()));
+                                Element start_address_chinese = document.getElementById("start_address_chinese");
+                                start_address_chinese.text(orderPrivateCar.getStartAddress());
+                                Element end_time_chinese = document.getElementById("end_time_chinese");
+                                end_time_chinese.text(sdf2.format(orderPrivateCar.getEndServiceTime()));
+                                Element end_address_chinese = document.getElementById("end_address_chinese");
+                                end_address_chinese.text(orderPrivateCar.getEndAddress());
+                                Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId()));
+                                Element server_tel_chinese = document.getElementById("server_tel_chinese");
+                                server_tel_chinese.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
+                            }
+                            if(2 == language){
+                                document.getElementById("chinese").remove();
+                                document.getElementById("french").remove();
+                                document.getElementsByTag("title").get(0).text("Receipt");
+                                Element title_english = document.getElementById("title_english");
+                                title_english.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，You spent GHS " + orderPrivateCar.getPayMoney() + " on the trip ");
+                                Element xcf_english = document.getElementById("xcf_english");
+                                xcf_english.text("GHS " + orderPrivateCar.getOrderMoney());
+                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
+                                    Element yhq_english = document.getElementById("yhq_english");
+                                    yhq_english.text("GHS -" + orderPrivateCar.getCouponMoney());
+                                }else{
+                                    Element yhq_english_div = document.getElementById("yhq_english_div");
+                                    yhq_english_div.remove();
+                                }
+                                if(null != orderPrivateCar.getDiscountMoney() && orderPrivateCar.getDiscountMoney() > 0){
+                                    Element zk_english = document.getElementById("zk_english");
+                                    zk_english.text("GHS -" + orderPrivateCar.getDiscountMoney());
+                                }else{
+                                    Element zk_english_div = document.getElementById("zk_english_div");
+                                    zk_english_div.remove();
+                                }
+                                if(null != orderPrivateCar.getRedPacketMoney() && orderPrivateCar.getRedPacketMoney() > 0){
+                                    Element hb_english = document.getElementById("hb_english");
+                                    hb_english.text("GHS -" + orderPrivateCar.getRedPacketMoney());
+                                }else{
+                                    Element hb_english_div = document.getElementById("hb_english_div");
+                                    hb_english_div.remove();
+                                }
+                                Element xj_english = document.getElementById("xj_english");
+                                xj_english.text("GHS " + orderPrivateCar.getPayMoney());
+                                Element pay_type_english = document.getElementById("pay_type_english");
+                                pay_type_english.text(orderPrivateCar.getPayType() == 1 ? "Mobile money" : "Bank card");
+                                Element pay_money_english = document.getElementById("pay_money_english");
+                                pay_money_english.text("GHS " + orderPrivateCar.getPayMoney());
+                                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");
+                                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");
+                                Element track_english = document.getElementById("track_english");
+                                track_english.attr("href", "http://182.160.16.251:81/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");
+                                for (int i = 0; i < driver_english.size(); i++) {
+                                    Element element = driver_english.get(i);
+                                    element.text(driver.getFirstName() + "." + driver.getLastName());
+                                }
+                                Element cp_english = document.getElementById("cp_english");
+                                cp_english.text("Number Plate：" + car.getCarLicensePlate());
+                                Element pf_english = document.getElementById("pf_english");
+                                pf_english.text("Driver Rating：" + aDouble);
+                                Element lc_english = document.getElementById("lc_english");
+                                lc_english.text("Mileage：" + aDouble1 + "KM / " + orderPrivateCar.getDuration() + "Minutes");
+                                Element start_time_english = document.getElementById("start_time_english");
+                                start_time_english.text(sdf2.format(orderPrivateCar.getTravelTime()));
+                                Element start_address_english = document.getElementById("start_address_english");
+                                start_address_english.text(orderPrivateCar.getStartAddress());
+                                Element end_time_english = document.getElementById("end_time_english");
+                                end_time_english.text(sdf2.format(orderPrivateCar.getEndServiceTime()));
+                                Element end_address_english = document.getElementById("end_address_english");
+                                end_address_english.text(orderPrivateCar.getEndAddress());
+                                Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId()));
+                                Element server_tel_english = document.getElementById("server_tel_english");
+                                server_tel_english.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
+                            }
+                            if(3 == language){
+                                document.getElementById("chinese").remove();
+                                document.getElementById("english").remove();
+                                document.getElementsByTag("title").get(0).text("Reçu");
+                                Element title_french = document.getElementById("title_french");
+                                title_french.text("Le " + DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + ", vous avez dépensé GHS " + orderPrivateCar.getPayMoney() + " sur le voyage");
+                                Element xcf_french = document.getElementById("xcf_french");
+                                xcf_french.text("GHS " + orderPrivateCar.getOrderMoney());
+                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
+                                    Element yhq_french = document.getElementById("yhq_french");
+                                    yhq_french.text("GHS -" + orderPrivateCar.getCouponMoney());
+                                }else{
+                                    Element yhq_french_div = document.getElementById("yhq_french_div");
+                                    yhq_french_div.remove();
+                                }
+                                if(null != orderPrivateCar.getDiscountMoney() && orderPrivateCar.getDiscountMoney() > 0){
+                                    Element zk_french = document.getElementById("zk_french");
+                                    zk_french.text("GHS -" + orderPrivateCar.getDiscountMoney());
+                                }else{
+                                    Element zk_french_div = document.getElementById("zk_french_div");
+                                    zk_french_div.remove();
+                                }
+                                if(null != orderPrivateCar.getRedPacketMoney() && orderPrivateCar.getRedPacketMoney() > 0){
+                                    Element hb_french = document.getElementById("hb_french");
+                                    hb_french.text("GHS -" + orderPrivateCar.getRedPacketMoney());
+                                }else{
+                                    Element hb_french_div = document.getElementById("hb_french_div");
+                                    hb_french_div.remove();
+                                }
+                                Element xj_french = document.getElementById("xj_french");
+                                xj_french.text("GHS " + orderPrivateCar.getPayMoney());
+                                Element pay_type_french = document.getElementById("pay_type_french");
+                                pay_type_french.text(orderPrivateCar.getPayType() == 1 ? "Argent mobile" : "Carte bancaire");
+                                Element pay_money_french = document.getElementById("pay_money_french");
+                                pay_money_french.text("GHS " + orderPrivateCar.getPayMoney());
+                                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");
+                                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");
+                                Element track_french = document.getElementById("track_french");
+                                track_french.attr("href", "http://182.160.16.251:81/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");
+                                for (int i = 0; i < driver_french.size(); i++) {
+                                    Element element = driver_french.get(i);
+                                    element.text(driver.getFirstName() + "." + driver.getLastName());
+                                }
+                                Element cp_french = document.getElementById("cp_french");
+                                cp_french.text("Plaque: GS " + car.getCarLicensePlate());
+                                Element pf_french = document.getElementById("pf_french");
+                                pf_french.text("Note du chauffeur: " + aDouble);
+                                Element lc_french = document.getElementById("lc_french");
+                                lc_french.text("Distance: " + aDouble1 + "km / " + orderPrivateCar.getDuration() + "minutes");
+                                Element start_time_french = document.getElementById("start_time_french");
+                                start_time_french.text(sdf2.format(orderPrivateCar.getTravelTime()));
+                                Element start_address_french = document.getElementById("start_address_french");
+                                start_address_french.text(orderPrivateCar.getStartAddress());
+                                Element end_time_french = document.getElementById("end_time_french");
+                                end_time_french.text(sdf2.format(orderPrivateCar.getEndServiceTime()));
+                                Element end_address_french = document.getElementById("end_address_french");
+                                end_address_french.text(orderPrivateCar.getEndAddress());
+                                Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId()));
+                                Element server_tel_french = document.getElementById("server_tel_french");
+                                server_tel_french.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
+                            }
+
+                            EmailUtil.send(userInfo.getEmail(), language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu",  document.html());
+
+                            //开始生成pdf收据和html收据
+                            File file = new File("/usr/local/nginx/html/files/html/");
+                            if(!file.exists()){
+                                file.mkdirs();
+                            }
+                            file = new File("/usr/local/nginx/html/files/html/ride_receipt_" + id + ".html");
+                            if(!file.exists()){
+                                file.createNewFile();
+                            }
+                            FileWriter fileWriter = new FileWriter(file);
+                            fileWriter.write(document.html());
+                            fileWriter.flush();
+                            fileWriter.close();
+
+                            File file1 = new File("/usr/local/nginx/html/files/pdf/");
+                            if(!file1.exists()){
+                                file1.mkdirs();
+                            }
+                            file1 = new File("/usr/local/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);
+                            }catch (Exception e){
+                                e.printStackTrace();
+                                System.out.println("html转pdf异常");
+                            }
+
+
+                            String link ="http://182.160.16.251:81/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.setUserId(userInfo.getId());
+                            tEmail.setType(1);
+                            tEmail.setOrderId(id);
+                            tEmail.setCreateTime(new Date());
+                            int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
+                            tEmail.setWeek(EmailUtil.getWeek(language,i));
+                            boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
+                            if(am){
+                                tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
+                            }else {
+                                tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
+                            }
+                            emailService.insert(tEmail);
+
+                        }catch (Exception e){
+                            e.printStackTrace();
+                        }
+                    }
+                }).start();
+            }
+
+
             // TODO: 2020/5/24 这里需要给司机和用户推送订单状态
             new Thread(new Runnable() {
                 @Override
@@ -1268,8 +2266,9 @@
                 }
             }).start();
 
-
-            systemNoticeService.addSystemNotice(1, "您已使用" + (type == 1 ? "微信" : "支付宝") + "成功完成出行订单支付，谢谢使用！", orderPrivateCar.getUserId(), 1);
+            systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功完成出行订单支付，谢谢使用！" : language == 2
+                    ? "You've paid for the ride order successfully, thank you for using I-GO"
+                    : "Vous avez payé la commande de course avec succès, merci d’utiliser I-GO", orderPrivateCar.getUserId(), 1);
         }else{
             System.err.println("预支付数据异常（orderId = "  + id + ")");
         }
@@ -1281,33 +2280,61 @@
     }
 
     @Override
-    public List<Map<String, Object>> queryMyOrderList(Integer uid, Integer pageNum, Integer size) throws Exception {
+    public List<Map<String, Object>> queryMyOrderList(Integer language, Integer uid, Integer pageNum, Integer size) throws Exception {
         pageNum = (pageNum - 1) * size;
         List<Map<String, Object>> maps = orderPrivateCarMapper.queryMyOrderList(uid, pageNum, size);
         for(Map<String, Object> map : maps){
-            if(Integer.valueOf(String.valueOf(map.get("state"))) == 11){
+            if(null != map.get("orderTime")){
+                String orderTime = map.get("orderTime").toString();
+                map.put("orderTime", DateUtil.conversionFormat(language, orderTime));
+            }
+            if(null != map.get("time")){
+                String time = map.get("time").toString();
+                map.put("time", DateUtil.conversionFormat1(language, time));
+            }
+            Integer orderId = Integer.valueOf(String.valueOf(map.get("orderId")));
+            Integer state = Integer.valueOf(String.valueOf(map.get("state")));
+            if(state == 11){
                 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");
+            }else{
+                map.put("receipt", "");
             }
         }
         return maps;
     }
 
     @Override
-    public List<Map<String, Object>> queryInvoiceOrder(Integer type, Date startTime, Date endTime, Double startMoney, Double endMoney, Integer uid) throws Exception {
+    public List<Map<String, Object>> queryInvoiceOrder(Integer language, Integer type, Date startTime, Date endTime, Double startMoney, Double endMoney, Integer uid) throws Exception {
         startTime = dateUtil.getStartOrEndDate(startTime, "start");
         endTime = dateUtil.getStartOrEndDate(endTime, "end");
-        return orderPrivateCarMapper.queryInvoiceOrder(type, startTime, endTime, startMoney, endMoney, uid);
+        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");
+            if(null != map.get("time")){
+                String time = map.get("time").toString();
+                map.put("time", DateUtil.conversionFormat(language, time));
+            }
+        }
+        return list;
     }
 
     @Override
-    public Map<String, Object> queryOrderInfo(Integer orderId) throws Exception {
+    public Map<String, Object> queryOrderInfo(Integer language, Integer orderId) throws Exception {
         Map<String, Object> map = orderPrivateCarMapper.queryOrderInfo(orderId);
+        if(null != map.get("travelTime")){
+            String travelTime = map.get("travelTime").toString();
+            map.put("travelTime", DateUtil.conversionFormat1(language, travelTime));
+        }
+        Integer state = Integer.valueOf(String.valueOf(map.get("state")));
         if(null != map.get("reassignNotice") && Integer.valueOf(String.valueOf(map.get("reassignNotice"))) == 2){//改派完成，重新获取了新的司机数据，开始修改数据防止继续调用
             OrderPrivateCar orderPrivateCar = this.selectById(orderId);
             orderPrivateCar.setReassignNotice(0);
             this.updateById(orderPrivateCar);
         }
-        if(Integer.valueOf(String.valueOf(map.get("state"))) == 11){
+        if(state == 11){
             map.put("state", map.get("oldState"));
         }
         if(Integer.valueOf(String.valueOf(map.get("state"))) != 8 && Integer.valueOf(String.valueOf(map.get("state"))) != 9){
@@ -1335,12 +2362,24 @@
         String driverId = redisUtil.getValue("DEVICE_" + map.get("driverId"));
         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");
+        }else{
+            map.put("receipt", "");
+        }
         return map;
     }
 
     @Override
-    public List<Map<String, Object>> queryMyTravelRecord(Integer uid) throws Exception {
-        return orderPrivateCarMapper.queryMyTravelRecord(uid);
+    public List<Map<String, Object>> queryMyTravelRecord(Integer language, Integer uid) throws Exception {
+        List<Map<String, Object>> list = orderPrivateCarMapper.queryMyTravelRecord(uid);
+        for (Map<String, Object> map : list) {
+            if(null != map.get("time")){
+                String time = map.get("time").toString();
+                map.put("time", DateUtil.conversionFormat(language, time));
+            }
+        }
+        return list;
     }
 
 
@@ -1356,28 +2395,47 @@
         OrderPrivateCar orderPrivateCar = this.selectById(orderId);
         //计算预计距离和剩余时间
         String value = redisUtil.getValue("DRIVER" + String.valueOf(orderPrivateCar.getDriverId()));
+        String d = "0";
+        String t = "0";
         if(null == value || "".equals(value)){
             System.err.println("司机没有上传位置信息");
 
             //调用获取轨迹中的数据
-            List<Map<String, Object>> list = orderPositionService.queryTrack(orderId, 2);
-            if(list.size() > 0){
-                Map<String, Object> map = list.get(list.size() - 1);
-                value = map.get("lon") + "," + map.get("lat");
+            File file = new File(filePath + orderId + "_1.txt");
+            if(file.exists()){
+                //读取文件(字符流)
+                BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(file),"UTF-8"));
+                //循环取出数据
+                String str = null;
+                StringBuffer sb = new StringBuffer();
+                while ((str = in.readLine()) != null) {
+                    sb.append(str);
+                }
+                List<OrderPosition> list = JSONArray.parseArray(sb.toString(), OrderPosition.class);
+                if(list.size() > 0){
+                    OrderPosition orderPosition = list.get(list.size() - 1);
+                    value = orderPosition.getLon() + "," + orderPosition.getLat();
+                }
             }
+        }
 
+        String lnt = "0";
+        String lat = "0";
+        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));
+
+            if(null == distancematrix){
+                System.err.println("查询距离出错了");
+            }else if(distancematrix.getDistance() == 0){
+                System.err.println("未获取到有效的距离");
+            }else{
+                d = new BigDecimal(distancematrix.getDistance()).divide(new BigDecimal(1000), new MathContext(2, RoundingMode.HALF_EVEN)).toString();
+                t = new BigDecimal(distancematrix.getDuration()).divide(new BigDecimal(60), new MathContext(2, RoundingMode.HALF_EVEN)).intValue() + "";
+            }
         }
-        String lnt = (null != value ? value.split(",")[0] : "0.0");
-        String lat = (null != value ? value.split(",")[0] : "0.0");
-        DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(orderPrivateCar.getStartLat(), orderPrivateCar.getStartLon(), Double.valueOf(lat), Double.valueOf(lnt));
-        String d = "0";
-        String t = "0";
-        if(null == distancematrix){
-            System.err.println("查询距离出错了");
-        }else{
-            d = new BigDecimal(distancematrix.getDistance()).divide(new BigDecimal(1000)).setScale(2, BigDecimal.ROUND_HALF_EVEN).toString();
-            t = new BigDecimal(distancematrix.getDuration()).divide(new BigDecimal(60)).setScale(2, BigDecimal.ROUND_HALF_EVEN).intValue() + "";
-        }
+
         OrderServerWarpper orderServerWarpper = new OrderServerWarpper();
         orderServerWarpper.setOrderId(orderPrivateCar.getId());
         orderServerWarpper.setOrderType(1);
@@ -1394,12 +2452,14 @@
             orderServerWarpper.setLaveTime("0");
         }
         if(orderPrivateCar.getState() == 5 || orderPrivateCar.getState() == 6){//服务中
-            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());
             if(null == distancematrix){
                 System.err.println("查询距离出错了");
+            }else if(distancematrix.getDistance() == 0){
+                System.err.println("未获取到有效的距离");
             }else{
-                d = new BigDecimal(distancematrix.getDistance()).divide(new BigDecimal(1000)).setScale(2, BigDecimal.ROUND_HALF_EVEN).toString();
-                t = new BigDecimal(distancematrix.getDuration()).divide(new BigDecimal(60)).setScale(2, BigDecimal.ROUND_HALF_EVEN).intValue() + "";
+                d = new BigDecimal(distancematrix.getDistance()).divide(new BigDecimal(1000), new MathContext(2, RoundingMode.HALF_EVEN)).toString();
+                t = new BigDecimal(distancematrix.getDuration()).divide(new BigDecimal(60), new MathContext(2, RoundingMode.HALF_EVEN)).intValue() + "";
             }
             orderServerWarpper.setReservationMileage("0");
             orderServerWarpper.setReservationTime("0");
@@ -1432,8 +2492,16 @@
      * @throws Exception
      */
     @Override
-    public List<Map<String, Object>> queryRedEnvelope(Integer uid) throws Exception {
-        return orderPrivateCarMapper.queryRedEnvelope(uid);
+    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");
+            if(null != map.get("time")){
+                String time = map.get("time").toString();
+                map.put("time", DateUtil.conversionFormat(language, time));
+            }
+        }
+        return list;
     }
 
     /**

--
Gitblit v1.7.1