From cf71570fb38ad1983cd40e65fb09e259e509d2a3 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 06 五月 2024 09:36:45 +0800
Subject: [PATCH] 修改bug

---
 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 1207 +++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 870 insertions(+), 337 deletions(-)

diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index 2a08e14..673d31a 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -194,6 +194,12 @@
     @Autowired
     private TEmailService emailService;
 
+    @Autowired
+    private IPhoneService phoneService;
+    
+    @Autowired
+    private IRedEnvelopePaymentSettingsService redEnvelopePaymentSettingsService;
+
 
 
     /**
@@ -228,16 +234,16 @@
          */
         List<OrderPrivateCar> orderPrivateCars = orderPrivateCarMapper.queryByState(uid, 1, 1, 1, 2, 3, 4, 5, 6,  11);
         if(orderPrivateCars.size() > 0){
-            return ResultUtil.error(language == 1 ? "有未完成的订单" : language == 2 ? "There are outstanding orders" : "Il y a des commandes en attente");
+            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(language == 1 ? "有未完成的订单" : language == 2 ? "There are outstanding orders" : "Il y a des commandes en attente");
+            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(language == 1 ? "有未完成的订单" : language == 2 ? "There are outstanding orders" : "Il y a des commandes en attente");
+            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);
@@ -251,7 +257,7 @@
 
         list = orderTaxiMapper.queryByState_(uid, 2, 1, 1, 2, 3, 4, 5, 6, 11);
         if(list.size() > 0 && reservation == 2){
-            return ResultUtil.error(language == 1 ? "有未完成的订单" : language == 2 ? "There are outstanding orders" : "Il y a des commandes en attente");
+            return ResultUtil.error(language == 1 ? "有未完成的订单" : language == 2 ? "Uncompleted order(s)" : "Commande(s) non complétée(s)");
         }
 
         startAddress = startAddress.replaceAll("& #40;", "(");
@@ -259,7 +265,7 @@
         endAddress = endAddress.replaceAll("& #40;", "(");
         endAddress = endAddress.replaceAll("& #41;", ")");
         if((orderSource == 1 || orderSource == 3) && null == serverCarModelId){
-            return ResultUtil.error(language == 1 ? "请选择服务车型" : language == 2 ? "Please select the service model" : "Veuillez sélectionner un modèle de service");
+            return ResultUtil.error(language == 1 ? "请选择服务车型" : language == 2 ? "Please select vehicle-type" : "Veuillez sélectionner le type de véhicule");
         }
 
         OrderPrivateCar orderPrivateCar = new OrderPrivateCar();
@@ -284,7 +290,7 @@
         if(instead == 0 || ToolUtil.isEmpty(orderPrivateCar.getPassengers())){
             UserInfo userInfo = userInfoService.selectById(uid);
             if(ToolUtil.isEmpty(userInfo.getPhone())){
-                return ResultUtil.error(language == 1 ? "请先绑定手机号码" : language == 2 ? "Please bind the mobile phone number first" : "Veuillez d’abord lier le numéro de téléphone mobile");
+                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.getFirstName() + "." + userInfo.getLastName());
             orderPrivateCar.setPassengersPhone(userInfo.getPhone());
@@ -297,35 +303,30 @@
         if(orderSource == 2){//扫码下单
             Driver driver = driverService.selectById(driverId);
             if(null == driver){
-                return ResultUtil.error(language == 1 ? "司机信息有误，无法完成下单" : language == 2 ? "Incorrect driver information, unable to complete the order" : "Les informations du conducteur sont incorrectes pour compléter la commande");
+                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(language == 1 ? "司机信息还未完成审核，无法完成下单" : language == 2 ? "The driver information has not been reviewed, and the order cannot be completed" : "Les informations du conducteur n’ont pas été vérifiées et la commande n’a pas pu être finalisée");
+                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(language == 1 ? "司机账户已被冻结，无法提供服务" : language == 2 ? "The driver's account has been frozen, unable to provide service" : "Le compte du conducteur a été bloqué et le service n’est pas disponible");
+                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(language == 1 ? "司机信息未通过审核，无法提供服务" : language == 2 ? "Driver information has not passed the audit, unable to provide service" : "Les informations du conducteur n’ont pas été vérifiées et le service n’a pas pu être fourni");
+                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(language == 1 ? "司机还未上线，无法提供服务" : language == 2 ? "The driver is not online and cannot provide service" : "Le chauffeur n’est pas en ligne et n’est pas en mesure d’offrir ses services");
+                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(language == 1 ? "司机正在服务中，无法提供服务" : language == 2 ? "The driver is in service and cannot provide service" : "Le chauffeur est en service et le service n’est pas disponible");
+                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(language == 1 ? "该司机不能服务此业务" : language == 2 ? "The driver cannot serve this service" : "Ce conducteur ne peut pas servir cette entreprise");
+                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));
+            int count = settlementRecordService.selectCount(new EntityWrapper<SettlementRecord>().eq("driverId", driverId).eq("paymentStatus", 1));
             if(count > 0){
-                return ResultUtil.error("司机未支付订单费用，无法进行接单");
-            }
-            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("司机未支付订单费用，无法进行接单");
+                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);
@@ -351,7 +352,6 @@
                 public void run() {
                     pushUtil.pushOrderState(1, uid, orderPrivateCar.getId(), 1, 2, 0);
                     pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, 2, 0);
-                    pushUtil.pushDriverPosition(orderPrivateCar.getId(), 1);
                 }
             }).start();
         }
@@ -428,7 +428,6 @@
                         public void run() {
                             pushUtil.pushOrderState(1, uid, orderPrivateCar.getId(), 1, 2, 0);
                             pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, 2, 0);
-                            pushUtil.pushDriverPosition(orderPrivateCar.getId(), 1);
                         }
                     }).start();
                 }
@@ -439,13 +438,29 @@
         //推单操作
         if(orderPrivateCar.getState() == 1){
             this.pushOrder(orderPrivateCar);
+        }else{
+//            //接单后定时任务判断司机是否去接乘客，没有则推送提醒
+//            CancleOrder cancleOrder = cancleOrderService.query(orderPrivateCar.getCompanyId());
+//            if(null != cancleOrder){
+//                JSONObject object = JSON.parseObject(cancleOrder.getContent());
+//                long time = object.getInteger("driverTimeout") * 60000L;
+//                new Timer().schedule(new TimerTask() {
+//                    @Override
+//                    public void run() {
+//                        OrderPrivateCar orderPrivateCar1 = OrderPrivateCarServiceImpl.this.selectById(orderPrivateCar.getId());
+//                        if(orderPrivateCar1.getState() == 2){
+//                            pushUtil.pushDriverTimeOut(1, orderPrivateCar1.getUserId(), orderPrivateCar1.getId(), 1);
+//                        }
+//                    }
+//                }, time);
+//            }
         }
 
 
         //添加消息
         systemNoticeService.addSystemNotice(1, language == 1 ? "您的打车订单已下单成功，我们正在为您指派司机，请稍后！" :
-                language == 2 ? "Your ride order has been successfully placed, we are assigning a driver for you, please wait!" :
-                        "Votre commande a bien été passée, nous vous assignons un chauffeur, veuillez patienter!", orderPrivateCar.getUserId(), 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());
@@ -465,10 +480,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){
@@ -477,7 +492,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);
@@ -487,7 +502,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);
@@ -502,28 +517,89 @@
         }
         return ResultUtil.success();
     }
-
+    
+    /**
+     * 获取取消需要支付的金额
+     * @param id
+     * @param language
+     * @return
+     * @throws Exception
+     */
     @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("获取数据失败，订单信息有误");
-        }
-        double amount = 0;
-        CancleOrder query = cancleOrderService.query(orderPrivateCar.getOrderType(), 1, orderPrivateCar.getCompanyId());
-        if(null != orderPrivateCar.getDriverId() && orderPrivateCar.getSnatchOrderTime()!=null &&
-                (orderPrivateCar.getSnatchOrderTime().getTime() + query.getMinuteNum() * 60 * 1000) < new Date().getTime()){//收费的情况
-            if(null != query){
-                amount += query.getMoney();
-            }
+            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. ");
         }
         BaseWarpper baseWarpper = new BaseWarpper();
+        double amount = 0;
+        CancleOrder query = cancleOrderService.query(orderPrivateCar.getCompanyId());
+        if(null == query || null == orderPrivateCar.getDriverId()){
+            baseWarpper.setAmount(amount);
+            return ResultUtil.success(baseWarpper);
+        }
+        JSONObject object = JSON.parseObject(query.getContent());
+        long t = object.getInteger("driverTimeout") * 60000L;
+        //司机超时未到达起点，免费取消
+        if(orderPrivateCar.getState() < 3 && orderPrivateCar.getSnatchOrderTime().getTime() + t < System.currentTimeMillis()){
+            baseWarpper.setAmount(amount);
+            return ResultUtil.success(baseWarpper);
+        }
+        //普通单
+        if(1 == orderPrivateCar.getOrderType()){
+            JSONObject order = object.getJSONObject("order");
+            long m = order.getInteger("orderAcceptanceTime") * 60000L;
+            //超过免费时间，计算费用
+            if(orderPrivateCar.getSnatchOrderTime().getTime() + m < System.currentTimeMillis()){
+                BigDecimal money = order.getBigDecimal("money");
+                if(null != orderPrivateCar.getSetOutTime()){
+                    //里程费
+                    BigDecimal mileageFee = order.getBigDecimal("mileageFee").multiply(new BigDecimal(orderPrivateCar.getMileage() / 1000));
+                    //时长费
+                    int s = Double.valueOf((System.currentTimeMillis() - orderPrivateCar.getSetOutTime().getTime()) / 60000).intValue();
+                    BigDecimal durationFee = order.getBigDecimal("durationFee").multiply(new BigDecimal(s));
+                    money = money.add(durationFee).add(mileageFee);
+                }
+                amount = money.setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+            }
+        }
+        //预约单
+        if(2 == orderPrivateCar.getOrderType()){
+            JSONObject order = object.getJSONObject("reservationOrder");
+            long m = order.getInteger("orderAcceptanceTime") * 60000L;
+            //超过免费时间，计算费用
+            if(System.currentTimeMillis() + m > orderPrivateCar.getTravelTime().getTime()){
+                BigDecimal money = order.getBigDecimal("money");
+                if(null != orderPrivateCar.getSetOutTime()){
+                    //里程费
+                    BigDecimal mileageFee = order.getBigDecimal("mileageFee").multiply(new BigDecimal(orderPrivateCar.getMileage() / 1000));
+                    //时长费
+                    int s = Double.valueOf((System.currentTimeMillis() - orderPrivateCar.getSetOutTime().getTime()) / 60000).intValue();
+                    BigDecimal durationFee = order.getBigDecimal("durationFee").multiply(new BigDecimal(s));
+                    //预定费用
+                    BigDecimal reservationFee = order.getBigDecimal("reservationFee");
+                    money = money.add(durationFee).add(mileageFee).add(reservationFee);
+                }
+                amount = money.setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+            }
+        }
         baseWarpper.setAmount(amount);
         return ResultUtil.success(baseWarpper);
     }
-
+    
+    
+    /**
+     * 添加取消操作
+     * @param id
+     * @param reason
+     * @param remark
+     * @param uid
+     * @param language
+     * @return
+     * @throws Exception
+     */
     @Override
-    public ResultUtil addCancle(Integer id, String reason, String remark, Integer uid, Integer language) throws Exception {
+    public ResultUtil addCancle(Integer id, String reason, String remark, Integer uid, Double lon, Double lat, String address, Integer language) throws Exception {
         if(ToolUtil.isNotEmpty(remark)){
             if(ToolUtil.isNotEmpty(remark)){
                 List<SensitiveWords> sensitiveWords = sensitiveWordsMapper.selectList(null);
@@ -537,11 +613,13 @@
         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){//摆渡车
                 OrderCrossCityServiceImpl.pushEndMap.remove(orderPrivateCar.getCrossCityOrderId());//删除标识数据
@@ -563,40 +641,54 @@
                 this.updateById(orderPrivateCar);
             }
         }else {
-            CancleOrder query = cancleOrderService.query(orderPrivateCar.getOrderType(), 1, orderPrivateCar.getCompanyId());
-            if (null != query) {
-                if ((orderPrivateCar.getSnatchOrderTime().getTime() + query.getMinuteNum() * 60 * 1000) < System.currentTimeMillis() && query.getMoney().compareTo(0D) > 0) {//收费的情况
-                    orderPrivateCar.setState(12);
-                    this.updateById(orderPrivateCar);
-                    integer = orderCancelService.saveData(id, 1, reason, remark, null, query.getMoney(), 1, 1, uid);
-                } else {
-                    integer = orderCancelService.saveData(id, 1, reason, remark, null, null, 2, 1, uid);
-
+            BaseWarpper data = queryCancleAmount(id, language).getData();
+            Double amount = data.getAmount();
+            if(0 == amount){
+                integer = orderCancelService.saveData(id, 1, reason, remark, null, null, 2, 1, uid);
+                if(5 == orderPrivateCar.getState()){
+                    orderPrivateCar.setState(6);
+                    orderPrivateCar.setGetoffLon(lon);
+                    orderPrivateCar.setGetoffLat(lat);
+                    orderPrivateCar.setGetoffAddress(address);
+                    orderPrivateCar.setGetoffTime(new Date());
+                    orderPrivateCar.setEndServiceTime(new Date());
+                    orderPrivateCar.setCancelMidway(1);
+                }else{
                     orderPrivateCar.setState(10);
-                    this.updateById(orderPrivateCar);
                 }
-                this.deleteTask(id);//删除定时任务
-
-                new Thread(new Runnable() {
-                    @Override
-                    public void run() {
-                        pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0);
-                        System.err.println("推送取消操作---------------------");
-                    }
-                }).start();
-
-                //修改司机为空闲
-                Driver driver = driverService.selectById(orderPrivateCar.getDriverId());
-                driver.setState(2);
-                driverService.updateById(driver);
+                this.updateById(orderPrivateCar);
             }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");
+                if(5 == orderPrivateCar.getState()){
+                    orderPrivateCar.setGetoffLon(lon);
+                    orderPrivateCar.setGetoffLat(lat);
+                    orderPrivateCar.setGetoffAddress(address);
+                    orderPrivateCar.setGetoffTime(new Date());
+                    orderPrivateCar.setEndServiceTime(new Date());
+                    orderPrivateCar.setCancelMidway(1);
+                }
+                orderPrivateCar.setOldState(6);
+                orderPrivateCar.setState(12);
+                this.updateById(orderPrivateCar);
+                integer = orderCancelService.saveData(id, 1, reason, remark, null, amount, 1, 1, uid);
             }
-
+            this.deleteTask(id);//删除定时任务
+    
+            new Thread(new Runnable() {
+                @Override
+                public void run() {
+                    pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0);
+                    System.err.println("推送取消操作---------------------");
+                }
+            }).start();
+    
+            //修改司机为空闲
+            Driver driver = driverService.selectById(orderPrivateCar.getDriverId());
+            driver.setState(2);
+            driverService.updateById(driver);
         }
 
         //添加消息
-        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);
@@ -617,10 +709,10 @@
         ResultUtil resultUtil = ResultUtil.success("");
 
         if(null == orderPrivateCar){
-            return ResultUtil.error(language == 1 ? "取消订单失败，订单信息有误" : language == 2 ? "Order cancellation failed because the order information is incorrect" : "Annulation échouée, informations de commande 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() != 12){
-            return ResultUtil.error(language == 1 ? "取消订单失败，不合法的操作" : language == 2 ? "Order cancellation failed, illegal operation" : "Annulation de la commande échouée, 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.", "");
         }
         OrderCancel orderCancel = null;
         if(null == cancleId || cancleId==0){
@@ -628,9 +720,9 @@
         }else{
             orderCancel = orderCancelService.selectById(cancleId);
         }
-
-        CancleOrder query = cancleOrderService.query(orderPrivateCar.getOrderType(), 1, orderPrivateCar.getCompanyId());
-        if(null != query){
+    
+        Double amount = queryCancleAmount(id, language).getData().getAmount();
+        if(0 < amount){
             if(payType == 1){//手机支付
                 orderCancel.setPayType(1);
                 orderCancelService.updateById(orderCancel);
@@ -642,7 +734,7 @@
                 checkoutRequest.setAccountNumber(userInfo.getPhone());
                 checkoutRequest.setCustomerFirstName(userInfo.getFirstName());
                 checkoutRequest.setCustomerLastName(userInfo.getLastName());
-                checkoutRequest.setRequestAmount(query.getMoney());
+                checkoutRequest.setRequestAmount(amount);
                 checkoutRequest.setMerchantTransactionId(merchantTransactionId);
                 checkoutRequest.setRequestDescription("Cancel a trip");
                 checkoutRequest.setCallbackUrl(callbackPath + "/base/wxCancelOrderTaxi");
@@ -651,7 +743,7 @@
                 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);//添加预支付数据
+                    paymentRecordService.saveData(1, null, null, id, 1, 1, amount, null, 1);//添加预支付数据
                 }
 
             }
@@ -667,7 +759,7 @@
                 checkoutRequest.setAccountNumber(bankCard.getCode());
                 checkoutRequest.setCustomerFirstName(bankCard.getFirstName());
                 checkoutRequest.setCustomerLastName(bankCard.getLastName());
-                checkoutRequest.setRequestAmount(query.getMoney());
+                checkoutRequest.setRequestAmount(amount);
                 checkoutRequest.setMerchantTransactionId(merchantTransactionId);
                 checkoutRequest.setRequestDescription("Cancel a trip");
                 checkoutRequest.setCallbackUrl(callbackPath + "/base/wxCancelOrderTaxi");
@@ -676,26 +768,30 @@
                 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);//添加预支付数据
+                    paymentRecordService.saveData(1, null, null, id, 1, 2, amount, null, 1);//添加预支付数据
                 }
 
             }
             if(payType == 3){//余额支付
-                if(userInfo.getBalance() != null && userInfo.getBalance() < query.getMoney()){
-                    return ResultUtil.error((language == 1 ? "账户余额不足" : language == 2 ? "Insufficient account balance" : "Solde de compte insuffisant"), "");
+                if(userInfo.getBalance() != null && userInfo.getBalance() < amount){
+                    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());
+                userInfo.setBalance(new BigDecimal(userInfo.getBalance()).subtract(new BigDecimal(amount)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
                 //添加交易明细
-                transactionDetailsService.saveData(uid, "取消订单", query.getMoney(), 2, 1, 1, 1, id);
+                transactionDetailsService.saveData(uid, "取消订单", amount, 2, 1, 1, 1, id);
                 userInfoService.updateById(userInfo);
 
                 //解除小号绑定
                 if(orderPrivateCar.getBindId() != null){
-                    chinaMobileUtil.midAxbUnBindSend(orderPrivateCar.getBindId(),orderPrivateCar.getTelX());
+                    ChinaMobileUtil.midAxbUnBindSend(orderPrivateCar.getBindId(),orderPrivateCar.getTelX());
                 }
-
-                orderPrivateCar.setState(10);
+    
+                if(5 == orderPrivateCar.getOldState()){
+                    orderPrivateCar.setState(6);
+                }else{
+                    orderPrivateCar.setState(10);
+                }
                 orderPrivateCar.setTelX("");
                 orderPrivateCar.setBindId("");
                 this.updateById(orderPrivateCar);
@@ -704,25 +800,24 @@
                 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();
-                BigDecimal c =new BigDecimal(query.getMoney());//司机收入
-                incomeService.saveData(2, orderPrivateCar.getDriverId(), 3, 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);
-
-                this.deleteTask(id);//删除定时任务
+                if(null != orderPrivateCar.getDriverId()){
+                    BigDecimal c =new BigDecimal(amount);//司机收入
+                    incomeService.saveData(2, orderPrivateCar.getDriverId(), 3, 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);
+    
+                    this.deleteTask(id);//删除定时任务
+                    pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0);
+                }
+                pushUtil.pushOrderState(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0);
 
                 //添加消息
                 systemNoticeService.addSystemNotice(1, language == 1 ? "您已使用余额成功支付取消订单费用，谢谢使用！" : language == 2
-                        ? "You have successfully paid the cancellation fee, thank you for using!"
-                        : "Vous avez payé avec succès les frais d’annulation de commande, merci d’utiliser!", orderPrivateCar.getUserId(), 1);
+                        ? "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;
@@ -811,8 +906,9 @@
         params.add("orderId", orderId + "");
         params.add("orderType", "1");
         HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(params, headers);
-        ResultUtil s = internalRestTemplate.postForObject("http://driver-server/base/netty/deleteTask", requestEntity, ResultUtil.class);
-        if(s.getCode() != 200){
+        String s = internalRestTemplate.postForObject("http://driver-server/base/netty/deleteTask", requestEntity, String.class);
+        JSONObject jsonObject = JSON.parseObject(s, JSONObject.class);
+        if(jsonObject.getIntValue("code") != 200){
             System.err.println("调用driver-server出错了");
         }
     }
@@ -823,17 +919,39 @@
         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;
     }
@@ -842,13 +960,13 @@
 
 
     @Override
-    public ResultUtil payPrivateCarOrder(Integer payType, Integer bankCardId, Integer orderId, Integer couponId, Integer type, Integer language) throws Exception {
+    public ResultUtil payPrivateCarOrder(Integer payType, Integer bankCardId, Integer orderId, Integer couponId, Integer redDeduction, Integer type, Integer language) throws Exception {
         OrderPrivateCar orderPrivateCar = this.selectById(orderId);
         if(orderPrivateCar.getState() == 8 || orderPrivateCar.getState() == 9){
-            return ResultUtil.error(language == 1 ? "订单已完成支付，不允许重复支付" : language == 2 ? "The order has been paid, no double payment is allowed" : "La commande a été payée, aucun paiement en double n’est autorisé", "");
+            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(language == 1 ? "订单不在待支付状态，不允许支付" : language == 2 ? "The order is not pending payment and cannot be paid" : "La commande n’est pas en attente de paiement et ne permet pas le paiement", "");
+            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();
@@ -857,39 +975,7 @@
         orderPrivateCar.setCouponMoney(0D);//初始化历史数据
         orderPrivateCar.setCouponId(null);
 
-        //计算优惠券
-        UserCouponRecord userCouponRecord = null;
-        if(null != couponId){
-            userCouponRecord = userCouponRecordService.selectById(couponId);
-            if(userCouponRecord.getCompanyId() != orderPrivateCar.getCompanyId()){
-                return ResultUtil.error(language == 1 ? "优惠券不能用于此订单" : language == 2 ? "Coupons cannot be used for this order" : "Le coupon ne peut pas être utilisé pour cette commande", "");
-            }
-            if(userCouponRecord.getState() == 2){
-                return ResultUtil.error(language == 1 ? "优惠券已使用" : language == 2 ? "Coupon used" : "Coupon a été utilisé", "");
-            }
-            if(userCouponRecord.getState() == 3){
-                return ResultUtil.error(language == 1 ? "优惠券已过期" : language == 2 ? "Coupon has expired" : "Le coupon a expiré", "");
-            }
-            if(userCouponRecord.getCouponUseType() != 0 && userCouponRecord.getCouponUseType() != 1){
-                return ResultUtil.error(language == 1 ? "优惠券不能用于此订单" : language == 2 ? "Coupons 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(language == 1 ? "优惠券不能用于此订单" : language == 2 ? "Coupons cannot be used for this order" : "Le coupon ne peut pas être utilisé pour cette commande", "");
-            }
-            orderMoney = orderMoney - userCouponRecord.getMoney();
-            orderPrivateCar.setCouponMoney(userCouponRecord.getMoney());
-            orderPrivateCar.setCouponId(couponId);
-        }
-        orderMoney=new BigDecimal(orderMoney).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
-
-        //计算红包
-        UserRedPacketRecord query = userRedPacketRecordService.query(uid, orderPrivateCar.getCompanyId(), 1, 1, orderMoney);
-        if(null != query && query.getMoney().compareTo(orderMoney) < 0){
-            orderMoney = orderMoney - query.getMoney();
-            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())"));
@@ -903,8 +989,94 @@
                     orderMoney = v;
                 }
             }
-
         }
+
+        //计算优惠券
+        UserCouponRecord userCouponRecord = null;
+        if(null != couponId){
+            //TODO 待翻译
+            if(null != redDeduction && 1 == redDeduction){
+                return ResultUtil.error(language == 1 ? "优惠券和红包不能同时使用" : language == 2 ? "" : "", "");
+            }
+            userCouponRecord = userCouponRecordService.selectById(couponId);
+            if(!userCouponRecord.getCompanyId().equals(orderPrivateCar.getCompanyId())){
+                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(language == 1 ? "优惠券已使用" : language == 2 ? "Coupon has been used." : "Le coupon a été utilisé.", "");
+            }
+            if(userCouponRecord.getState() == 3){
+                return ResultUtil.error(language == 1 ? "优惠券已过期" : language == 2 ? "Coupon is expired." : "Le coupon a expiré.", "");
+            }
+            if(userCouponRecord.getCouponUseType() != 0 && userCouponRecord.getCouponUseType() != 1){
+                return ResultUtil.error(language == 1 ? "优惠券不能用于此订单" : language == 2 ? "Coupon cannot be used for this order." : "Le coupon ne peut pas être utilisé pour cette commande.", "");
+            }
+            if(userCouponRecord.getCouponType() == 2 && orderMoney.compareTo(userCouponRecord.getFullMoney()) < 0){
+                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());
+            orderPrivateCar.setCouponId(couponId);
+        }
+        orderMoney=new BigDecimal(orderMoney).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
+
+        //计算红包
+        if(null != redDeduction && 1 == redDeduction){
+            RedEnvelopePaymentSettings redEnvelopePaymentSettings = redEnvelopePaymentSettingsService.getRedEnvelopePaymentSettings();
+            if(null != redEnvelopePaymentSettings){
+                Double total = userRedPacketRecordService.queryRemainingAmount(uid);
+                List<UserRedPacketRecord> userRedPacketRecords = userRedPacketRecordService.selectList(new EntityWrapper<UserRedPacketRecord>().eq("userId", uid)
+                        .eq("state", 1).eq("companyId", orderPrivateCar.getCompanyId()).gt("remainingAmount", 0).orderBy("insertTime", false));
+                if(total.compareTo(orderMoney) >= 0){
+                    BigDecimal deductionRatio = redEnvelopePaymentSettings.getDeductionRatio();
+                    BigDecimal multiply = new BigDecimal(orderMoney).multiply(deductionRatio.divide(new BigDecimal(100)));
+                    orderPrivateCar.setRedPacketMoney(multiply.doubleValue());
+                    orderMoney = orderMoney - multiply.doubleValue();
+                    
+                    //获取红包id
+                    JSONArray jsonArray = new JSONArray();
+                    for (UserRedPacketRecord userRedPacketRecord : userRedPacketRecords) {
+                        JSONObject jsonObject = new JSONObject();
+                        jsonObject.put("id", userRedPacketRecord.getId());
+                        BigDecimal remainingAmount = new BigDecimal(userRedPacketRecord.getRemainingAmount());
+                        if(multiply.compareTo(remainingAmount) >= 0){
+                            multiply = multiply.subtract(remainingAmount);
+                            jsonObject.put("money", remainingAmount);
+                            jsonArray.add(jsonObject);
+                        }else{
+                            userRedPacketRecord.setRemainingAmount(remainingAmount.subtract(multiply).doubleValue());
+                            jsonObject.put("money", multiply);
+                            jsonArray.add(jsonObject);
+                            break;
+                        }
+                    }
+                    orderPrivateCar.setRedPacketId(jsonArray.toJSONString());
+                }else{
+                    orderPrivateCar.setRedPacketMoney(total);
+                    orderMoney = orderMoney - total;
+                    //获取红包id
+                    JSONArray jsonArray = new JSONArray();
+                    BigDecimal multiply = new BigDecimal(total);
+                    for (UserRedPacketRecord userRedPacketRecord : userRedPacketRecords) {
+                        JSONObject jsonObject = new JSONObject();
+                        jsonObject.put("id", userRedPacketRecord.getId());
+                        BigDecimal remainingAmount = new BigDecimal(userRedPacketRecord.getRemainingAmount());
+                        if(multiply.compareTo(remainingAmount) >= 0){
+                            multiply = multiply.subtract(remainingAmount);
+                            jsonObject.put("money", remainingAmount);
+                            jsonArray.add(jsonObject);
+                        }else{
+                            userRedPacketRecord.setRemainingAmount(remainingAmount.subtract(multiply).doubleValue());
+                            jsonObject.put("money", multiply);
+                            jsonArray.add(jsonObject);
+                            break;
+                        }
+                    }
+                    orderPrivateCar.setRedPacketId(jsonArray.toJSONString());
+                }
+            }
+        }
+        
 
         if(payType == 1){//手机支付
             SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
@@ -958,7 +1130,7 @@
         }
         if(payType == 3){//余额支付
             if(userInfo.getBalance() == null || userInfo.getBalance() < orderMoney){
-                return ResultUtil.error(language == 1 ? "账户余额不足" : language == 2 ? "Insufficient account balance" : "Solde de compte insuffisant", "");
+                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());
@@ -974,18 +1146,29 @@
             orderPrivateCar.setPayType(3);
             orderPrivateCar.setPayMoney(orderMoney);
             orderPrivateCar.setOrderMoney(orderPrivateCar.getOrderMoney()+orderPrivateCar.getFreeMoney().doubleValue());
-
+            
             //处理优惠券和红包
             if(null != userCouponRecord){
                 userCouponRecord.setState(2);
                 userCouponRecord.setEndTime(new Date());
                 userCouponRecordService.updateById(userCouponRecord);
             }
-            if(null != query){
-                query.setState(2);
-                query.setEndTime(new Date());
-                userRedPacketRecordService.updateById(query);
+            if(null != orderPrivateCar.getRedPacketId()){
+                JSONArray jsonArray = JSON.parseArray(orderPrivateCar.getRedPacketId());
+                for (int i = 0; i < jsonArray.size(); i++) {
+                    JSONObject jsonObject = jsonArray.getJSONObject(i);
+                    Integer id1 = jsonObject.getInteger("id");
+                    Double money = jsonObject.getDouble("money");
+                    UserRedPacketRecord userRedPacketRecord = userRedPacketRecordService.selectById(id1);
+                    userRedPacketRecord.setRemainingAmount(userRedPacketRecord.getRemainingAmount() - money);
+                    if(0 == userRedPacketRecord.getRemainingAmount()){
+                        userRedPacketRecord.setState(2);
+                        userRedPacketRecord.setEndTime(new Date());
+                    }
+                    userRedPacketRecordService.updateById(userRedPacketRecord);
+                }
             }
+            
             if(orderPrivateCar.getIsplatPay()==1){
                 //添加已收入明细
                 Company company = companyService.selectById(orderPrivateCar.getCompanyId());
@@ -1018,7 +1201,7 @@
                             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 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());
@@ -1030,16 +1213,38 @@
                             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(sdf.format(orderPrivateCar.getTravelTime()) + "，您在I-GO1个订单消费GHS " + orderPrivateCar.getPayMoney());
+                                title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，您在I-GO此订单消费GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
                                 Element xcf_chinese = document.getElementById("xcf_chinese");
-                                xcf_chinese.text("GHS " + orderPrivateCar.getOrderMoney());
+                                xcf_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
+                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
+                                    Element yhq_chinese = document.getElementById("yhq_chinese");
+                                    yhq_chinese.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
+                                }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 -" + new BigDecimal(orderPrivateCar.getDiscountMoney()).setScale(2, RoundingMode.HALF_EVEN));
+                                }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 -" + new BigDecimal(orderPrivateCar.getRedPacketMoney()).setScale(2, RoundingMode.HALF_EVEN));
+                                }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.getOrderMoney());
+                                xj_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
                                 Element pay_type_chinese = document.getElementById("pay_type_chinese");
-                                pay_type_chinese.text("余额");
+                                pay_type_chinese.text("余额支付");
                                 Element pay_money_chinese = document.getElementById("pay_money_chinese");
-                                pay_money_chinese.text("GHS " + orderPrivateCar.getPayMoney());
+                                pay_money_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
                                 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");
@@ -1047,11 +1252,11 @@
                                 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(sdf1.format(orderPrivateCar.getEndServiceTime()));
+                                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.text(" " + driver.getFirstName() + "." + driver.getLastName());
                                 }
                                 Element cp_chinese = document.getElementById("cp_chinese");
                                 cp_chinese.text("车牌：" + car.getCarLicensePlate());
@@ -1067,20 +1272,45 @@
                                 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(sdf.format(orderPrivateCar.getTravelTime()) + "，You spent GHS " + orderPrivateCar.getPayMoney() + " on the trip ");
+                                title_english.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，You spent GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue() + " on the trip ");
                                 Element xcf_english = document.getElementById("xcf_english");
-                                xcf_english.text("GHS " + orderPrivateCar.getOrderMoney());
+                                xcf_english.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
+                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
+                                    Element yhq_english = document.getElementById("yhq_english");
+                                    yhq_english.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
+                                }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 -" + new BigDecimal(orderPrivateCar.getDiscountMoney()).setScale(2, RoundingMode.HALF_EVEN));
+                                }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 -" + new BigDecimal(orderPrivateCar.getRedPacketMoney()).setScale(2, RoundingMode.HALF_EVEN));
+                                }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.getOrderMoney());
+                                xj_english.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
                                 Element pay_type_english = document.getElementById("pay_type_english");
-                                pay_type_english.text("balance");
+                                pay_type_english.text("I-GO Wallet");
                                 Element pay_money_english = document.getElementById("pay_money_english");
-                                pay_money_english.text("GHS " + orderPrivateCar.getPayMoney());
+                                pay_money_english.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
                                 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");
@@ -1088,11 +1318,11 @@
                                 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(sdf1.format(orderPrivateCar.getEndServiceTime()));
+                                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.text(" " + driver.getFirstName() + "." + driver.getLastName());
                                 }
                                 Element cp_english = document.getElementById("cp_english");
                                 cp_english.text("Number Plate：" + car.getCarLicensePlate());
@@ -1108,20 +1338,45 @@
                                 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("Vous consommez GHS " + orderPrivateCar.getPayMoney() + " sur votre commande i-go1 le " + sdf.format(orderPrivateCar.getTravelTime()));
+                                title_french.text("Le " + DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + ", vous avez dépensé GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue() + " sur le voyage");
                                 Element xcf_french = document.getElementById("xcf_french");
-                                xcf_french.text("GHS " + orderPrivateCar.getOrderMoney());
+                                xcf_french.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
+                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
+                                    Element yhq_french = document.getElementById("yhq_french");
+                                    yhq_french.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
+                                }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 -" + new BigDecimal(orderPrivateCar.getDiscountMoney()).setScale(2, RoundingMode.HALF_EVEN));
+                                }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 -" + new BigDecimal(orderPrivateCar.getRedPacketMoney()).setScale(2, RoundingMode.HALF_EVEN));
+                                }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.getOrderMoney());
+                                xj_french.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
                                 Element pay_type_french = document.getElementById("pay_type_french");
-                                pay_type_french.text("Le solde");
+                                pay_type_french.text("Portefeuille I-GO");
                                 Element pay_money_french = document.getElementById("pay_money_french");
-                                pay_money_french.text("GHS " + orderPrivateCar.getPayMoney());
+                                pay_money_french.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
                                 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");
@@ -1129,18 +1384,18 @@
                                 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(sdf1.format(orderPrivateCar.getEndServiceTime()));
+                                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.text(" " + driver.getFirstName() + "." + driver.getLastName());
                                 }
                                 Element cp_french = document.getElementById("cp_french");
-                                cp_french.text("Plaque d’immatriculation：" + car.getCarLicensePlate());
+                                cp_french.text("Plaque: GS " + car.getCarLicensePlate());
                                 Element pf_french = document.getElementById("pf_french");
-                                pf_french.text("Évaluation des pilotes: " + aDouble);
+                                pf_french.text("Note du chauffeur: " + aDouble);
                                 Element lc_french = document.getElementById("lc_french");
-                                lc_french.text("Kilométrage: " + aDouble1 + "km / " + orderPrivateCar.getDuration() + "minutes");
+                                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");
@@ -1149,8 +1404,11 @@
                                 end_time_french.text(sdf2.format(orderPrivateCar.getEndServiceTime()));
                                 Element end_address_french = document.getElementById("end_address_french");
                                 end_address_french.text(orderPrivateCar.getEndAddress());
+                                Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId()));
+                                Element server_tel_french = document.getElementById("server_tel_french");
+                                server_tel_french.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
                             }
-                            EmailUtil.send(userInfo.getEmail(), language == 1 ? "打车收据" : language == 2 ? "Ride receipt" : "Reçu de Ride",  document.html());
+                            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/");
@@ -1165,7 +1423,7 @@
                             fileWriter.write(document.html());
                             fileWriter.flush();
                             fileWriter.close();
-                            FileInputStream fileInputStream = new FileInputStream(file);
+
                             File file1 = new File("/usr/local/nginx/html/files/pdf/");
                             if(!file1.exists()){
                                 file1.mkdirs();
@@ -1174,15 +1432,19 @@
                             if(!file1.exists()){
                                 file1.createNewFile();
                             }
-                            FileOutputStream fileOutputStream = new FileOutputStream(file1);
-                            HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream);
-
+                            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 ? "打车收据" : language == 2 ? "Ride receipt" : "Reçu de Ride");
+                            tEmail.setName(language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu");
                             tEmail.setType(1);
                             tEmail.setOrderId(orderId);
                             tEmail.setCreateTime(new Date());
@@ -1190,9 +1452,9 @@
                             tEmail.setWeek(EmailUtil.getWeek(language,i));
                             boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
                             if(am){
-                                tEmail.setAmOrPm(language==1?"上午":language==2?"AM":"Dans la matinée");
+                                tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
                             }else {
-                                tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
+                                tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
                             }
                             emailService.insert(tEmail);
 
@@ -1217,8 +1479,8 @@
             }).start();
 
             systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功完成出行订单支付，谢谢使用！" : language == 2
-                    ? "You have successfully completed the travel order payment, thank you for using!"
-                    : "Vous avez complété avec succès le paiement de votre commande de voyage. Merci d’utiliser!", orderPrivateCar.getUserId(), 1);
+                    ? "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);
         }
 
 
@@ -1236,17 +1498,53 @@
             orderPrivateCar.setPayMoney(orderMoney);
             orderPrivateCar.setOrderMoney(orderPrivateCar.getOrderMoney()+orderPrivateCar.getFreeMoney().doubleValue());
 
+            Driver driver = driverService.selectById(orderPrivateCar.getDriverId());
+
             //处理优惠券和红包
             if(null != userCouponRecord){
                 userCouponRecord.setState(2);
                 userCouponRecord.setEndTime(new Date());
                 userCouponRecordService.updateById(userCouponRecord);
+                //添加优惠收入补贴
+                Double money = userCouponRecord.getMoney();
+                incomeService.saveData(2, orderPrivateCar.getDriverId(), 5, orderPrivateCar.getId(), 1, money);
+                driver.setBusinessMoney(new BigDecimal(null != driver.getBusinessMoney() ? driver.getBusinessMoney() : 0).add(new BigDecimal(money)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+                driver.setLaveBusinessMoney(new BigDecimal(null != driver.getLaveBusinessMoney() ? driver.getLaveBusinessMoney() : 0).add(new BigDecimal(money)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+                driver.setBalance(new BigDecimal(null != driver.getBalance() ? driver.getBalance() : 0).add(new BigDecimal(money)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+                driverService.updateById(driver);
             }
-            if(null != query){
-                query.setState(2);
-                query.setEndTime(new Date());
-                userRedPacketRecordService.updateById(query);
+            if(null != orderPrivateCar.getRedPacketId()){
+                JSONArray jsonArray = JSON.parseArray(orderPrivateCar.getRedPacketId());
+                for (int i = 0; i < jsonArray.size(); i++) {
+                    JSONObject jsonObject = jsonArray.getJSONObject(i);
+                    Integer id1 = jsonObject.getInteger("id");
+                    Double money = jsonObject.getDouble("money");
+                    UserRedPacketRecord userRedPacketRecord = userRedPacketRecordService.selectById(id1);
+                    userRedPacketRecord.setRemainingAmount(userRedPacketRecord.getRemainingAmount() - money);
+                    if(0 == userRedPacketRecord.getRemainingAmount()){
+                        userRedPacketRecord.setState(2);
+                        userRedPacketRecord.setEndTime(new Date());
+                    }
+                    userRedPacketRecordService.updateById(userRedPacketRecord);
+                }
+                Double money = orderPrivateCar.getRedPacketMoney();
+                incomeService.saveData(2, orderPrivateCar.getDriverId(), 7, orderPrivateCar.getId(), 1, money);
+                driver.setBusinessMoney(new BigDecimal(null != driver.getBusinessMoney() ? driver.getBusinessMoney() : 0).add(new BigDecimal(money)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+                driver.setLaveBusinessMoney(new BigDecimal(null != driver.getLaveBusinessMoney() ? driver.getLaveBusinessMoney() : 0).add(new BigDecimal(money)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+                driver.setBalance(new BigDecimal(null != driver.getBalance() ? driver.getBalance() : 0).add(new BigDecimal(money)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+                driverService.updateById(driver);
             }
+            
+            if(null != orderPrivateCar.getDiscountMoney() && 0 < orderPrivateCar.getDiscountMoney()){
+                Double money = orderPrivateCar.getDiscountMoney();
+                incomeService.saveData(2, orderPrivateCar.getDriverId(), 6, orderPrivateCar.getId(), 1, money);
+                driver.setBusinessMoney(new BigDecimal(null != driver.getBusinessMoney() ? driver.getBusinessMoney() : 0).add(new BigDecimal(money)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+                driver.setLaveBusinessMoney(new BigDecimal(null != driver.getLaveBusinessMoney() ? driver.getLaveBusinessMoney() : 0).add(new BigDecimal(money)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+                driver.setBalance(new BigDecimal(null != driver.getBalance() ? driver.getBalance() : 0).add(new BigDecimal(money)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+                driverService.updateById(driver);
+            }
+
+
             if(orderPrivateCar.getIsplatPay()==1){
                 //添加已收入明细
                 Company company = companyService.selectById(orderPrivateCar.getCompanyId());
@@ -1264,7 +1562,7 @@
                 }
 //                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());
@@ -1286,24 +1584,34 @@
                     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);
-
+                        Integer type1 = jsonObject.getInteger("type");
+                        if(1 == type1){
+                            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) {
-                                detail.setSettlementRecordId(settlementRecord.getId());
-                                settlementDetailService.updateById(detail);
+                                total = total.add(new BigDecimal(detail.getPrice()));
+                            }
+                            if(maxPrice.compareTo(total.doubleValue()) <= 0){
+                                SettlementRecord settlementRecord = settlementRecordService.selectOne(new EntityWrapper<SettlementRecord>().eq("driverId", orderPrivateCar.getDriverId())
+                                        .eq("type", type1).eq("paymentStatus", 1).last(" and day = DATE_FORMAT(now(), '%Y-%m-%d')"));
+                                if(null == settlementRecord){
+                                    settlementRecord = new SettlementRecord();
+                                    settlementRecord.setDay(new Date());
+                                    settlementRecord.setDriverId(orderPrivateCar.getDriverId());
+                                    settlementRecord.setType(type1);
+                                    settlementRecord.setPaymentStatus(1);
+                                    settlementRecord.setPayMoney(total.doubleValue());
+                                    settlementRecord.setInsertTime(new Date());
+                                    settlementRecordService.insert(settlementRecord);
+                                }else{
+                                    settlementRecord.setPayMoney(total.doubleValue());
+                                    settlementRecordService.updateById(settlementRecord);
+                                }
+                                for (SettlementDetail detail : settlementDetailList) {
+                                    detail.setSettlementRecordId(settlementRecord.getId());
+                                    settlementDetailService.updateById(detail);
+                                }
                             }
                         }
                     }
@@ -1318,7 +1626,7 @@
                             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 sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
                             SimpleDateFormat sdf2 = new SimpleDateFormat("HH:mm");
                             Car car = carMapper.selectById(orderPrivateCar.getCarId());
                             Double aDouble = 0D;
@@ -1330,16 +1638,38 @@
                             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(sdf.format(orderPrivateCar.getTravelTime()) + "，您在I-GO1个订单消费GHS " + orderPrivateCar.getPayMoney());
+                                title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，您在I-GO此订单消费GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
                                 Element xcf_chinese = document.getElementById("xcf_chinese");
-                                xcf_chinese.text("GHS " + orderPrivateCar.getOrderMoney());
+                                xcf_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
+                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
+                                    Element yhq_chinese = document.getElementById("yhq_chinese");
+                                    yhq_chinese.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
+                                }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 -" + new BigDecimal(orderPrivateCar.getDiscountMoney()).setScale(2, RoundingMode.HALF_EVEN));
+                                }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 -" + new BigDecimal(orderPrivateCar.getRedPacketMoney()).setScale(2, RoundingMode.HALF_EVEN));
+                                }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.getOrderMoney());
+                                xj_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
                                 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());
+                                pay_money_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
                                 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");
@@ -1347,11 +1677,11 @@
                                 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(sdf1.format(orderPrivateCar.getEndServiceTime()));
+                                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.text(" " + driver.getFirstName() + "." + driver.getLastName());
                                 }
                                 Element cp_chinese = document.getElementById("cp_chinese");
                                 cp_chinese.text("车牌：" + car.getCarLicensePlate());
@@ -1367,20 +1697,45 @@
                                 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(sdf.format(orderPrivateCar.getTravelTime()) + "，You spent GHS " + orderPrivateCar.getPayMoney() + " on the trip ");
+                                title_english.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，You spent GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue() + " on the trip ");
                                 Element xcf_english = document.getElementById("xcf_english");
-                                xcf_english.text("GHS " + orderPrivateCar.getOrderMoney());
+                                xcf_english.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
+                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
+                                    Element yhq_english = document.getElementById("yhq_english");
+                                    yhq_english.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
+                                }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 -" + new BigDecimal(orderPrivateCar.getDiscountMoney()).setScale(2, RoundingMode.HALF_EVEN));
+                                }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 -" + new BigDecimal(orderPrivateCar.getRedPacketMoney()).setScale(2, RoundingMode.HALF_EVEN));
+                                }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.getOrderMoney());
+                                xj_english.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
                                 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());
+                                pay_money_english.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
                                 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");
@@ -1388,11 +1743,11 @@
                                 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(sdf1.format(orderPrivateCar.getEndServiceTime()));
+                                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.text(" " + driver.getFirstName() + "." + driver.getLastName());
                                 }
                                 Element cp_english = document.getElementById("cp_english");
                                 cp_english.text("Number Plate：" + car.getCarLicensePlate());
@@ -1408,20 +1763,45 @@
                                 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("Vous consommez GHS " + orderPrivateCar.getPayMoney() + " sur votre commande i-go1 le " + sdf.format(orderPrivateCar.getTravelTime()));
+                                title_french.text("Le " + DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + ", vous avez dépensé GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue() + " sur le voyage");
                                 Element xcf_french = document.getElementById("xcf_french");
-                                xcf_french.text("GHS " + orderPrivateCar.getOrderMoney());
+                                xcf_french.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
+                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
+                                    Element yhq_french = document.getElementById("yhq_french");
+                                    yhq_french.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
+                                }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 -" + new BigDecimal(orderPrivateCar.getDiscountMoney()).setScale(2, RoundingMode.HALF_EVEN));
+                                }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 -" + new BigDecimal(orderPrivateCar.getRedPacketMoney()).setScale(2, RoundingMode.HALF_EVEN));
+                                }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.getOrderMoney());
+                                xj_french.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
                                 Element pay_type_french = document.getElementById("pay_type_french");
-                                pay_type_french.text("espèces");
+                                pay_type_french.text("En espèces");
                                 Element pay_money_french = document.getElementById("pay_money_french");
-                                pay_money_french.text("GHS " + orderPrivateCar.getPayMoney());
+                                pay_money_french.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
                                 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");
@@ -1429,18 +1809,18 @@
                                 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(sdf1.format(orderPrivateCar.getEndServiceTime()));
+                                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.text(" " + driver.getFirstName() + "." + driver.getLastName());
                                 }
                                 Element cp_french = document.getElementById("cp_french");
-                                cp_french.text("Plaque d’immatriculation：" + car.getCarLicensePlate());
+                                cp_french.text("Plaque: GS " + car.getCarLicensePlate());
                                 Element pf_french = document.getElementById("pf_french");
-                                pf_french.text("Évaluation des pilotes: " + aDouble);
+                                pf_french.text("Note du chauffeur: " + aDouble);
                                 Element lc_french = document.getElementById("lc_french");
-                                lc_french.text("Kilométrage: " + aDouble1 + "km / " + orderPrivateCar.getDuration() + "minutes");
+                                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");
@@ -1449,9 +1829,12 @@
                                 end_time_french.text(sdf2.format(orderPrivateCar.getEndServiceTime()));
                                 Element end_address_french = document.getElementById("end_address_french");
                                 end_address_french.text(orderPrivateCar.getEndAddress());
+                                Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId()));
+                                Element server_tel_french = document.getElementById("server_tel_french");
+                                server_tel_french.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
                             }
 
-                            EmailUtil.send(userInfo.getEmail(), language == 1 ? "打车收据" : language == 2 ? "Ride receipt" : "Reçu de Ride",  document.html());
+                            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/");
@@ -1466,7 +1849,7 @@
                             fileWriter.write(document.html());
                             fileWriter.flush();
                             fileWriter.close();
-                            FileInputStream fileInputStream = new FileInputStream(file);
+
                             File file1 = new File("/usr/local/nginx/html/files/pdf/");
                             if(!file1.exists()){
                                 file1.mkdirs();
@@ -1475,13 +1858,18 @@
                             if(!file1.exists()){
                                 file1.createNewFile();
                             }
-                            FileOutputStream fileOutputStream = new FileOutputStream(file1);
-                            HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream);
+                            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 ? "打车收据" : language == 2 ? "Ride receipt" : "Reçu de Ride");
+                            tEmail.setName(language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu");
                             tEmail.setType(1);
                             tEmail.setOrderId(orderId);
                             tEmail.setCreateTime(new Date());
@@ -1489,9 +1877,9 @@
                             tEmail.setWeek(EmailUtil.getWeek(language,i));
                             boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
                             if(am){
-                                tEmail.setAmOrPm(language==1?"上午":language==2?"AM":"Dans la matinée");
+                                tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
                             }else {
-                                tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
+                                tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
                             }
                             emailService.insert(tEmail);
 
@@ -1516,8 +1904,8 @@
             }).start();
 
             systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功完成出行订单支付，谢谢使用！" : language == 2
-                    ? "You have successfully completed the travel order payment, thank you for using!"
-                    : "Vous avez complété avec succès le paiement de votre commande de voyage. Merci d’utiliser!", orderPrivateCar.getUserId(), 1);
+                    ? "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);
@@ -1540,10 +1928,7 @@
             }else{//随机金额
                 Double startMoney = Double.valueOf(String.valueOf(query.get("startMoney")));
                 Double endMoney = Double.valueOf(String.valueOf(query.get("endMoney")));
-                int i = new BigDecimal(endMoney).subtract(new BigDecimal(startMoney)).intValue();
-                Random random = new Random();
-                int num = random.nextInt(i);
-                money = new BigDecimal(startMoney).add(new BigDecimal(num)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
+                money = new BigDecimal(startMoney + (Math.random() * (endMoney - startMoney))).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
             }
             //判断当前红包是否大于剩余可领取总金额
             if(money.compareTo(Double.valueOf(query.get("lavePrice").toString())) > 0){
@@ -1558,10 +1943,10 @@
             //添加临时红包数据
             UserRedPacketRecord userRedPacketRecord = new UserRedPacketRecord();
             userRedPacketRecord.setMoney(money);
+            userRedPacketRecord.setRemainingAmount(money);
             Calendar calendar = Calendar.getInstance();
             calendar.setTime(new Date());
             calendar.set(Calendar.DAY_OF_MONTH, calendar.get(Calendar.DAY_OF_MONTH) + Integer.valueOf(String.valueOf(query.get("effective"))));
-            userRedPacketRecord.setExpirationTime(calendar.getTime());
             userRedPacketRecord.setInsertTime(new Date());
             userRedPacketRecord.setCompanyId(Integer.valueOf(String.valueOf(query.get("companyId"))));
             userRedPacketRecord.setState(0);
@@ -1583,11 +1968,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();
 
@@ -1599,6 +1984,10 @@
             query.setState(1);
             query.setRedPacketActivityId(id.getId());
             userRedPacketRecordService.updateById(query);
+            
+            // todo 待翻译
+            String content = 1 == language ? ("您收到一个额度为GHS " + money + " 的红包，请查收") : 2 == language ? "" : "";
+            systemNoticeService.addSystemNotice(1, content, query.getUserId(), 1);
 
             UserInfo userInfo = userInfoService.selectById(orderPrivateCar.getUserId());
             if(ToolUtil.isNotEmpty(userInfo.getEmail())){
@@ -1608,29 +1997,32 @@
                 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("此活动有效期在" + sdf.format(query.getInsertTime()) + "至" + sdf.format(query.getEndTime()) + "，详情请查看I-GO平台");
+                    time_chinese.text("此活动有效期在 " + DateUtil.conversionFormat(language, sdf.format(id.getStartTime())) + " 至 " + DateUtil.conversionFormat(language, sdf.format(id.getEndTime())) + "，详情请查看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" + sdf.format(query.getInsertTime()) + "to" + sdf.format(query.getEndTime()) + "，check more details on the app.");
+                    time_english.text("You could use it from " + DateUtil.conversionFormat(language, sdf.format(id.getStartTime())) + " to " + DateUtil.conversionFormat(language, sdf.format(id.getEndTime())) + "，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" + sdf.format(query.getInsertTime()) + "au" + sdf.format(query.getEndTime()) + ". Veuillez consulter la plateforme i-go pour plus de détails.");
+                    time_french.text("Cette promotion est valable du " + DateUtil.conversionFormat(language, sdf.format(id.getStartTime())) + " au " + DateUtil.conversionFormat(language, sdf.format(id.getEndTime())) + ". Veuillez consulter la plateforme i-go pour plus de détails.");
                 }
 
-                EmailUtil.send(userInfo.getEmail(), language == 1 ? "红包活动" : language == 2 ? "Red envelope activity" : "Activité de l’enveloppe rouge",  document.html());
+                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()){
@@ -1644,33 +2036,22 @@
                 fileWriter.write(document.html());
                 fileWriter.flush();
                 fileWriter.close();
-                FileInputStream fileInputStream = new FileInputStream(file);
-                File file1 = new File("/usr/local/nginx/html/files/pdf/");
-                if(!file1.exists()){
-                    file1.mkdirs();
-                }
-                file1 = new File("/usr/local/nginx/html/files/pdf/redpacket_" + orderId + ".pdf");
-                if(!file1.exists()){
-                    file1.createNewFile();
-                }
-                FileOutputStream fileOutputStream = new FileOutputStream(file1);
-                HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream);
 
                 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 ? "Red envelope activity" : "Activité de l’enveloppe rouge");
+                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?"AM":"Dans la matinée");
+                    tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
                 }else {
-                    tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
+                    tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
                 }
                 emailService.insert(tEmail);
 
@@ -1694,10 +2075,14 @@
         if(null != query){
             //添加交易明细
             transactionDetailsService.saveData(orderPrivateCar.getUserId(), "取消订单", query.getAmount(), 2, 1, 1, 1, query.getOrderId());
-            orderPrivateCar.setState(10);
+            if(5 == orderPrivateCar.getOldState()){
+                orderPrivateCar.setState(6);
+            }else{
+                orderPrivateCar.setState(10);
+            }
             //解除小号绑定
             if(orderPrivateCar.getBindId() != null){
-                chinaMobileUtil.midAxbUnBindSend(orderPrivateCar.getBindId(),orderPrivateCar.getTelX());
+                ChinaMobileUtil.midAxbUnBindSend(orderPrivateCar.getBindId(),orderPrivateCar.getTelX());
             }
             orderPrivateCar.setBindId("");
             orderPrivateCar.setTelX("");
@@ -1713,32 +2098,24 @@
                 orderCancelService.updateById(query1);
             }
 
-            //添加已收入明细
-            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());
-            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);
-            this.deleteTask(orderPrivateCar.getId());//删除定时任务
-
-            // TODO: 2020/5/24 这里需要给司机和用户推送订单状态
-//            new Thread(new Runnable() {
-//                @Override
-//                public void run() {
-//                    pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0);
-//                }
-//            }).start();
+            if(null != orderPrivateCar.getDriverId()){
+                BigDecimal c =new BigDecimal(query.getAmount());//司机收入
+                incomeService.saveData(2, orderPrivateCar.getDriverId(), 3, 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);
+                this.deleteTask(orderPrivateCar.getId());//删除定时任务
+    
+                pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0);
+            }
+            pushUtil.pushOrderState(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0);
 
             //添加消息
             systemNoticeService.addSystemNotice(1, language == 1 ? "您已使用余额成功支付取消订单费用，谢谢使用！" : language == 2
-                    ? "You have successfully paid the cancellation fee, thank you for using!"
-                    : "Vous avez payé avec succès les frais d’annulation de commande, merci d’utiliser!", orderPrivateCar.getUserId(), 1);
+                    ? "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 + ")");
         }
@@ -1770,10 +2147,19 @@
                 userCouponRecordService.updateById(userCouponRecord);
             }
             if(null != orderPrivateCar.getRedPacketId()){
-                UserRedPacketRecord userRedPacketRecord = userRedPacketRecordService.selectById(orderPrivateCar.getRedPacketId());
-                userRedPacketRecord.setState(2);
-                userRedPacketRecord.setEndTime(new Date());
-                userRedPacketRecordService.updateById(userRedPacketRecord);
+                JSONArray jsonArray = JSON.parseArray(orderPrivateCar.getRedPacketId());
+                for (int i = 0; i < jsonArray.size(); i++) {
+                    JSONObject jsonObject = jsonArray.getJSONObject(i);
+                    Integer id1 = jsonObject.getInteger("id");
+                    Double money = jsonObject.getDouble("money");
+                    UserRedPacketRecord userRedPacketRecord = userRedPacketRecordService.selectById(id1);
+                    userRedPacketRecord.setRemainingAmount(userRedPacketRecord.getRemainingAmount() - money);
+                    if(0 == userRedPacketRecord.getRemainingAmount()){
+                        userRedPacketRecord.setState(2);
+                    }
+                    userRedPacketRecord.setEndTime(new Date());
+                    userRedPacketRecordService.updateById(userRedPacketRecord);
+                }
             }
 
 
@@ -1813,7 +2199,7 @@
                             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 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());
@@ -1825,16 +2211,38 @@
                             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(sdf.format(orderPrivateCar.getTravelTime()) + "，您在I-GO1个订单消费GHS " + orderPrivateCar.getPayMoney());
+                                title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，您在I-GO此订单消费GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
                                 Element xcf_chinese = document.getElementById("xcf_chinese");
-                                xcf_chinese.text("GHS " + orderPrivateCar.getOrderMoney());
+                                xcf_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
+                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
+                                    Element yhq_chinese = document.getElementById("yhq_chinese");
+                                    yhq_chinese.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
+                                }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 -" + new BigDecimal(orderPrivateCar.getDiscountMoney()).setScale(2, RoundingMode.HALF_EVEN));
+                                }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 -" + new BigDecimal(orderPrivateCar.getRedPacketMoney()).setScale(2, RoundingMode.HALF_EVEN));
+                                }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.getOrderMoney());
+                                xj_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
                                 Element pay_type_chinese = document.getElementById("pay_type_chinese");
-                                pay_type_chinese.text(orderPrivateCar.getPayType() == 1 ? "手机" : "银行卡");
+                                pay_type_chinese.text(orderPrivateCar.getPayType() == 1 ? "手机支付" : (orderPrivateCar.getPayType() == 2?"银行卡支付":(orderPrivateCar.getPayType() == 3?"余额支付":"现金支付")));
                                 Element pay_money_chinese = document.getElementById("pay_money_chinese");
-                                pay_money_chinese.text("GHS " + orderPrivateCar.getPayMoney());
+                                pay_money_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
                                 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");
@@ -1842,11 +2250,11 @@
                                 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(sdf1.format(orderPrivateCar.getEndServiceTime()));
+                                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.text(" " + driver.getFirstName() + "." + driver.getLastName());
                                 }
                                 Element cp_chinese = document.getElementById("cp_chinese");
                                 cp_chinese.text("车牌：" + car.getCarLicensePlate());
@@ -1862,20 +2270,45 @@
                                 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(sdf.format(orderPrivateCar.getTravelTime()) + "，You spent GHS " + orderPrivateCar.getPayMoney() + " on the trip ");
+                                title_english.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，You spent GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue() + " on the trip ");
                                 Element xcf_english = document.getElementById("xcf_english");
-                                xcf_english.text("GHS " + orderPrivateCar.getOrderMoney());
+                                xcf_english.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
+                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
+                                    Element yhq_english = document.getElementById("yhq_english");
+                                    yhq_english.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
+                                }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 -" + new BigDecimal(orderPrivateCar.getDiscountMoney()).setScale(2, RoundingMode.HALF_EVEN));
+                                }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 -" + new BigDecimal(orderPrivateCar.getRedPacketMoney()).setScale(2, RoundingMode.HALF_EVEN));
+                                }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.getOrderMoney());
+                                xj_english.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
                                 Element pay_type_english = document.getElementById("pay_type_english");
-                                pay_type_english.text(orderPrivateCar.getPayType() == 1 ? "Mobile" : "Bank card");
+                                pay_type_english.text(orderPrivateCar.getPayType() == 1 ? "Mobile money" :(orderPrivateCar.getPayType() == 2?"Bank card":(orderPrivateCar.getPayType() == 3?"I-GO Wallet":"Cash")));
                                 Element pay_money_english = document.getElementById("pay_money_english");
-                                pay_money_english.text("GHS " + orderPrivateCar.getPayMoney());
+                                pay_money_english.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
                                 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");
@@ -1883,11 +2316,11 @@
                                 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(sdf1.format(orderPrivateCar.getEndServiceTime()));
+                                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.text(" " + driver.getFirstName() + "." + driver.getLastName());
                                 }
                                 Element cp_english = document.getElementById("cp_english");
                                 cp_english.text("Number Plate：" + car.getCarLicensePlate());
@@ -1903,20 +2336,45 @@
                                 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("Vous consommez GHS " + orderPrivateCar.getPayMoney() + " sur votre commande i-go1 le " + sdf.format(orderPrivateCar.getTravelTime()));
+                                title_french.text("Le " + DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + ", vous avez dépensé GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue() + " sur le voyage");
                                 Element xcf_french = document.getElementById("xcf_french");
-                                xcf_french.text("GHS " + orderPrivateCar.getOrderMoney());
+                                xcf_french.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
+                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
+                                    Element yhq_french = document.getElementById("yhq_french");
+                                    yhq_french.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
+                                }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 -" + new BigDecimal(orderPrivateCar.getDiscountMoney()).setScale(2, RoundingMode.HALF_EVEN));
+                                }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 -" + new BigDecimal(orderPrivateCar.getRedPacketMoney()).setScale(2, RoundingMode.HALF_EVEN));
+                                }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.getOrderMoney());
+                                xj_french.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
                                 Element pay_type_french = document.getElementById("pay_type_french");
-                                pay_type_french.text(orderPrivateCar.getPayType() == 1 ? "Mobile" : "Carte bancaire");
+                                pay_type_french.text(orderPrivateCar.getPayType() == 1 ? "Argent mobile" : (orderPrivateCar.getPayType() == 2?"Carte bancaire":(orderPrivateCar.getPayType() == 3?"Portefeuille I-GO":"En espèces")));
                                 Element pay_money_french = document.getElementById("pay_money_french");
-                                pay_money_french.text("GHS " + orderPrivateCar.getPayMoney());
+                                pay_money_french.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
                                 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");
@@ -1924,18 +2382,18 @@
                                 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(sdf1.format(orderPrivateCar.getEndServiceTime()));
+                                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.text(" " + driver.getFirstName() + "." + driver.getLastName());
                                 }
                                 Element cp_french = document.getElementById("cp_french");
-                                cp_french.text("Plaque d’immatriculation：" + car.getCarLicensePlate());
+                                cp_french.text("Plaque: GS " + car.getCarLicensePlate());
                                 Element pf_french = document.getElementById("pf_french");
-                                pf_french.text("Évaluation des pilotes: " + aDouble);
+                                pf_french.text("Note du chauffeur: " + aDouble);
                                 Element lc_french = document.getElementById("lc_french");
-                                lc_french.text("Kilométrage: " + aDouble1 + "km / " + orderPrivateCar.getDuration() + "minutes");
+                                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");
@@ -1944,9 +2402,12 @@
                                 end_time_french.text(sdf2.format(orderPrivateCar.getEndServiceTime()));
                                 Element end_address_french = document.getElementById("end_address_french");
                                 end_address_french.text(orderPrivateCar.getEndAddress());
+                                Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId()));
+                                Element server_tel_french = document.getElementById("server_tel_french");
+                                server_tel_french.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
                             }
 
-                            EmailUtil.send(userInfo.getEmail(), language == 1 ? "打车收据" : language == 2 ? "Ride receipt" : "Reçu de Ride",  document.html());
+                            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/");
@@ -1961,7 +2422,7 @@
                             fileWriter.write(document.html());
                             fileWriter.flush();
                             fileWriter.close();
-                            FileInputStream fileInputStream = new FileInputStream(file);
+
                             File file1 = new File("/usr/local/nginx/html/files/pdf/");
                             if(!file1.exists()){
                                 file1.mkdirs();
@@ -1970,14 +2431,19 @@
                             if(!file1.exists()){
                                 file1.createNewFile();
                             }
-                            FileOutputStream fileOutputStream = new FileOutputStream(file1);
-                            HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream);
+                            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 ? "打车收据" : language == 2 ? "Ride receipt" : "Reçu de Ride");
+                            tEmail.setName(language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu");
                             tEmail.setUserId(userInfo.getId());
                             tEmail.setType(1);
                             tEmail.setOrderId(id);
@@ -1986,9 +2452,9 @@
                             tEmail.setWeek(EmailUtil.getWeek(language,i));
                             boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
                             if(am){
-                                tEmail.setAmOrPm(language==1?"上午":language==2?"AM":"Dans la matinée");
+                                tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
                             }else {
-                                tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
+                                tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
                             }
                             emailService.insert(tEmail);
 
@@ -2010,8 +2476,8 @@
             }).start();
 
             systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功完成出行订单支付，谢谢使用！" : language == 2
-                    ? "You have successfully completed the travel order payment, thank you for using!"
-                    : "Vous avez complété avec succès le paiement de votre commande de voyage. Merci d’utiliser!", orderPrivateCar.getUserId(), 1);
+                    ? "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 + ")");
         }
@@ -2023,10 +2489,18 @@
     }
 
     @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(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){
@@ -2042,15 +2516,27 @@
     }
 
     @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);
@@ -2090,12 +2576,26 @@
         }else{
             map.put("receipt", "");
         }
+        Integer companyId = 1;
+        if(null != map.get("driverId")){
+            companyId = Integer.valueOf(String.valueOf(map.get("companyId")));
+        }
+        CancleOrder cancleOrder = cancleOrderService.selectOne(new EntityWrapper<CancleOrder>().eq("companyId", companyId));
+        JSONObject jsonObject = JSON.parseObject(cancleOrder.getContent());
+        map.put("timeOutCancel", jsonObject.getIntValue("driverTimeout"));
         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;
     }
 
 
@@ -2208,8 +2708,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;
     }
 
     /**
@@ -2241,4 +2749,29 @@
         }
         return endPushWarpper;
     }
+    
+    
+    /**
+     * 修改目的地
+     * @param orderId
+     * @param endLon
+     * @param endLat
+     * @param endAddress
+     */
+    @Override
+    public void updateEndAddress(Integer orderId, String endLon, String endLat, String endAddress) {
+        OrderPrivateCar orderPrivateCar = this.selectById(orderId);
+        if(null != orderPrivateCar.getDriverId()){
+            orderPrivateCar.setDestination(endAddress);
+            orderPrivateCar.setDestinationLat(endLat);
+            orderPrivateCar.setDestinationLon(endLon);
+            this.updateById(orderPrivateCar);
+            pushUtil.pushModifyAddress(2, orderPrivateCar.getDriverId(), orderId, 1, 1);
+        }else{
+            orderPrivateCar.setEndAddress(endAddress);
+            orderPrivateCar.setEndLat(Double.valueOf(endLat));
+            orderPrivateCar.setEndLon(Double.valueOf(endLon));
+            this.updateById(orderPrivateCar);
+        }
+    }
 }

--
Gitblit v1.7.1