From 49e88798dcea0164f77c59f0be9eefdf67a3d228 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 17 七月 2024 15:03:10 +0800
Subject: [PATCH] 2.0bug修改

---
 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java |  707 +++++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 493 insertions(+), 214 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 9a6cd86..0d97fbf 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
@@ -20,6 +20,7 @@
 import com.stylefeng.guns.modular.system.service.*;
 import com.stylefeng.guns.modular.system.util.*;
 import com.stylefeng.guns.modular.system.util.GoogleMap.DistancematrixVo;
+import com.stylefeng.guns.modular.system.util.GoogleMap.FleetEngineUtil;
 import com.stylefeng.guns.modular.system.util.GoogleMap.GoogleMapUtil;
 import com.stylefeng.guns.modular.system.util.GoogleMap.ReverseGeocodeVo;
 import com.stylefeng.guns.modular.system.util.Tingg.TinggPayUtil;
@@ -48,6 +49,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
+import org.springframework.util.StringUtils;
 import org.springframework.web.client.RestTemplate;
 
 import javax.annotation.Resource;
@@ -196,6 +198,18 @@
 
     @Autowired
     private IPhoneService phoneService;
+    
+    @Autowired
+    private IRedEnvelopePaymentSettingsService redEnvelopePaymentSettingsService;
+    
+    @Autowired
+    private FleetEngineUtil fleetEngineUtil;
+    
+    @Resource
+    private CarModelMapper carModelMapper;
+    
+    @Autowired
+    private ICarService carService;
 
 
 
@@ -321,13 +335,8 @@
             if(query.size() == 0){
                 return ResultUtil.error(language == 1 ? "该司机不能服务此业务" : language == 2 ? "Driver has outstanding fees to pay, unable to receive orders." : "Le chauffeur a des frais impayés à payer, incapable de recevoir des commandes.");
             }
-
-            int 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(language == 1 ? "司机未支付订单费用，无法进行接单" : language == 2 ? "Driver has outstanding fees to pay, unable to receive orders." : "Le chauffeur a des frais impayés à payer, incapable de recevoir des commandes.");
-            }
-            int count1 = orderLogisticsService.selectCount(new EntityWrapper<OrderLogistics>().eq("driverId", driverId).eq("driverPay", 1).ne("state", 10).eq("isDelete", 1));
-            if(count1 > 0){
                 return ResultUtil.error(language == 1 ? "司机未支付订单费用，无法进行接单" : language == 2 ? "Driver has outstanding fees to pay, unable to receive orders." : "Le chauffeur a des frais impayés à payer, incapable de recevoir des commandes.");
             }
 
@@ -346,7 +355,31 @@
 
         orderPrivateCar.setIsReassign(1);
         orderPrivateCar.setIsDelete(1);
+        orderPrivateCar.setTripId(UUIDUtil.getRandomCode());
         this.insert(orderPrivateCar);
+    
+    
+        String vehicleId = null;
+        if(null != orderPrivateCar.getDriverId()){
+            Driver driver = driverService.selectById(orderPrivateCar.getDriverId());
+            Car car = carMapper.selectById(driver.getCarId());
+            if(!StringUtils.hasLength(car.getVehicleId())){
+                car.setVehicleId(UUIDUtil.getRandomCode());
+                carMapper.updateById(car);
+            }
+            //查询车辆信息，没有则创建信息
+            String vehicles = fleetEngineUtil.getVehicles(car.getVehicleId());
+            if(ToolUtil.isEmpty(vehicles)){
+                CarModel carModel = carModelMapper.selectById(car.getCarModelId());
+                fleetEngineUtil.createVehicles(carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
+                fleetEngineUtil.updateVehicles("ONLINE", carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
+            }
+    
+        }
+        //创建行程数据
+        fleetEngineUtil.createTrip(vehicleId, 1, orderPrivateCar.getTripId(),
+                orderPrivateCar.getStartLat().toString(), orderPrivateCar.getStartLon().toString(), orderPrivateCar.getEndLat().toString(), orderPrivateCar.getEndLon().toString());
+        
 
         if(orderSource == 2){//扫码下单
             new Thread(new Runnable() {
@@ -354,7 +387,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();
         }
@@ -431,7 +463,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();
                 }
@@ -442,6 +473,22 @@
         //推单操作
         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);
+//            }
         }
 
 
@@ -453,6 +500,7 @@
         BaseWarpper baseWarpper = new BaseWarpper();
         baseWarpper.setState(orderPrivateCar.getState());
         baseWarpper.setId(orderPrivateCar.getId());
+        baseWarpper.setContent(orderPrivateCar.getTripId());
         return ResultUtil.success(baseWarpper);
     }
 
@@ -505,28 +553,89 @@
         }
         return ResultUtil.success();
     }
-
+    
+    /**
+     * 获取取消需要支付的金额
+     * @param id
+     * @param language
+     * @return
+     * @throws Exception
+     */
     @Override
     public ResultUtil<BaseWarpper> queryCancleAmount(Integer id, Integer language) throws Exception {
         OrderPrivateCar orderPrivateCar = this.selectById(id);
         if(null == orderPrivateCar){
             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.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();
+        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();
             }
         }
-        BaseWarpper baseWarpper = new BaseWarpper();
+        //预约单
+        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);
@@ -545,6 +654,8 @@
         if(orderPrivateCar.getState() > 5 && orderPrivateCar.getState() != 11){
             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());//删除标识数据
@@ -566,37 +677,55 @@
                 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 complete the setting of cancellation rules from the background." : "Veuillez compléter le réglage des règles d’annulation à partir de l’arrière-plan.");
+                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);
         }
+        
+        //修改行程信息
+        fleetEngineUtil.updateTrip("CANCELED", null, null, orderPrivateCar.getTripId(), null, null, null, null);
+        
 
         //添加消息
         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);
@@ -631,9 +760,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);
@@ -645,7 +774,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");
@@ -654,7 +783,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);//添加预支付数据
                 }
 
             }
@@ -670,7 +799,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");
@@ -679,26 +808,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()){
+                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);
@@ -707,20 +840,19 @@
                 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
@@ -868,7 +1000,7 @@
 
 
     @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, recurring payments is not allowed." : "La commande a été payée, les paiements récurrents ne sont pas autorisés.", "");
@@ -902,8 +1034,11 @@
         //计算优惠券
         UserCouponRecord userCouponRecord = null;
         if(null != couponId){
+            if(null != redDeduction && 1 == redDeduction){
+                return ResultUtil.error(language == 1 ? "优惠券和红包不能同时使用" : language == 2 ? "Coupons and lucky-promo cannot be used at the same time." : "Les coupons et les bonus ne peuvent pas être utilisés en même temps", "");
+            }
             userCouponRecord = userCouponRecordService.selectById(couponId);
-            if(userCouponRecord.getCompanyId() != orderPrivateCar.getCompanyId()){
+            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){
@@ -925,12 +1060,62 @@
         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());
+        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");
@@ -1000,18 +1185,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());
@@ -1058,36 +1254,36 @@
                                 document.getElementById("french").remove();
                                 document.getElementsByTag("title").get(0).text("I-GO电子收据");
                                 Element title_chinese = document.getElementById("title_chinese");
-                                title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，您在I-GO此订单消费GHS " + orderPrivateCar.getPayMoney());
+                                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 -" + orderPrivateCar.getCouponMoney());
+                                    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 -" + orderPrivateCar.getDiscountMoney());
+                                    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 -" + orderPrivateCar.getRedPacketMoney());
+                                    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.getPayMoney());
+                                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");
@@ -1099,7 +1295,7 @@
                                 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());
@@ -1124,36 +1320,36 @@
                                 document.getElementById("french").remove();
                                 document.getElementsByTag("title").get(0).text("Receipt");
                                 Element title_english = document.getElementById("title_english");
-                                title_english.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，You spent GHS " + orderPrivateCar.getPayMoney() + " on the trip ");
+                                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 -" + orderPrivateCar.getCouponMoney());
+                                    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 -" + orderPrivateCar.getDiscountMoney());
+                                    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 -" + orderPrivateCar.getRedPacketMoney());
+                                    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.getPayMoney());
+                                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("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");
@@ -1165,7 +1361,7 @@
                                 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());
@@ -1190,36 +1386,36 @@
                                 document.getElementById("english").remove();
                                 document.getElementsByTag("title").get(0).text("Reçu");
                                 Element title_french = document.getElementById("title_french");
-                                title_french.text("Le " + DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + ", vous avez dépensé GHS " + orderPrivateCar.getPayMoney() + " sur le voyage");
+                                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 -" + orderPrivateCar.getCouponMoney());
+                                    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 -" + orderPrivateCar.getDiscountMoney());
+                                    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 -" + orderPrivateCar.getRedPacketMoney());
+                                    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.getPayMoney());
+                                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("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");
@@ -1231,7 +1427,7 @@
                                 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: GS " + car.getCarLicensePlate());
@@ -1277,7 +1473,7 @@
                             }
                             try {
                                 FileOutputStream fileOutputStream = new FileOutputStream(file1);
-                                HtmlToPdfUtils.convertToPdf("/usr/local/nginx/html/files/html/ride_receipt_" + orderId + ".html", "IGO", fileOutputStream);
+                                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异常");
@@ -1341,17 +1537,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());
@@ -1369,7 +1601,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());
@@ -1391,24 +1623,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);
+                                }
                             }
                         }
                     }
@@ -1437,36 +1679,36 @@
                                 document.getElementById("french").remove();
                                 document.getElementsByTag("title").get(0).text("I-GO电子收据");
                                 Element title_chinese = document.getElementById("title_chinese");
-                                title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，您在I-GO此订单消费GHS " + orderPrivateCar.getPayMoney());
+                                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 -" + orderPrivateCar.getCouponMoney());
+                                    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 -" + orderPrivateCar.getDiscountMoney());
+                                    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 -" + orderPrivateCar.getRedPacketMoney());
+                                    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.getPayMoney());
+                                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");
@@ -1478,7 +1720,7 @@
                                 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());
@@ -1503,36 +1745,36 @@
                                 document.getElementById("french").remove();
                                 document.getElementsByTag("title").get(0).text("Receipt");
                                 Element title_english = document.getElementById("title_english");
-                                title_english.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，You spent GHS " + orderPrivateCar.getPayMoney() + " on the trip ");
+                                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 -" + orderPrivateCar.getCouponMoney());
+                                    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 -" + orderPrivateCar.getDiscountMoney());
+                                    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 -" + orderPrivateCar.getRedPacketMoney());
+                                    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.getPayMoney());
+                                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");
@@ -1544,7 +1786,7 @@
                                 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());
@@ -1569,36 +1811,36 @@
                                 document.getElementById("english").remove();
                                 document.getElementsByTag("title").get(0).text("Reçu");
                                 Element title_french = document.getElementById("title_french");
-                                title_french.text("Le " + DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + ", vous avez dépensé GHS " + orderPrivateCar.getPayMoney() + " sur le voyage");
+                                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 -" + orderPrivateCar.getCouponMoney());
+                                    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 -" + orderPrivateCar.getDiscountMoney());
+                                    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 -" + orderPrivateCar.getRedPacketMoney());
+                                    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.getPayMoney());
+                                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("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");
@@ -1610,7 +1852,7 @@
                                 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: GS " + car.getCarLicensePlate());
@@ -1657,7 +1899,7 @@
                             }
                             try {
                                 FileOutputStream fileOutputStream = new FileOutputStream(file1);
-                                HtmlToPdfUtils.convertToPdf("/usr/local/nginx/html/files/html/ride_receipt_" + orderId + ".html", "IGO", fileOutputStream);
+                                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异常");
@@ -1725,10 +1967,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){
@@ -1743,10 +1982,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);
@@ -1784,6 +2023,9 @@
             query.setState(1);
             query.setRedPacketActivityId(id.getId());
             userRedPacketRecordService.updateById(query);
+            
+            String content = 1 == language ? ("您收到一个额度为GHS " + money + " 的红包，请查收") : 2 == language ? "You have received a lucky promo of GHS " + money + ", please check" : "Vous avez reçu un bonus de GHS " + money + ", veuillez vérifier";
+            systemNoticeService.addSystemNotice(1, content, query.getUserId(), 1);
 
             UserInfo userInfo = userInfoService.selectById(orderPrivateCar.getUserId());
             if(ToolUtil.isNotEmpty(userInfo.getEmail())){
@@ -1797,7 +2039,7 @@
                     Element user_chinese = document.getElementById("user_chinese");
                     user_chinese.text("您好 " + userInfo.getNickName() + "，");
                     Element time_chinese = document.getElementById("time_chinese");
-                    time_chinese.text("此活动有效期在 " + DateUtil.conversionFormat(language, sdf.format(query.getInsertTime())) + " 至 " + DateUtil.conversionFormat(language, sdf.format(query.getExpirationTime())) + "，详情请查看I-GO平台");
+                    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();
@@ -1806,7 +2048,7 @@
                     Element user_english = document.getElementById("user_english");
                     user_english.text("Hello " + userInfo.getNickName() + "，");
                     Element time_english = document.getElementById("time_english");
-                    time_english.text("You could use it from " + DateUtil.conversionFormat(language, sdf.format(query.getInsertTime())) + " to " + DateUtil.conversionFormat(language, sdf.format(query.getExpirationTime())) + "，check more details on the app.");
+                    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();
@@ -1815,7 +2057,7 @@
                     Element user_french = document.getElementById("user_french");
                     user_french.text("Bonjour " + userInfo.getNickName() + "，");
                     Element time_french = document.getElementById("time_french");
-                    time_french.text("Cette promotion est valable du " + DateUtil.conversionFormat(language, sdf.format(query.getInsertTime())) + " au " + DateUtil.conversionFormat(language, sdf.format(query.getExpirationTime())) + ". Veuillez consulter la plateforme i-go pour plus de détails.");
+                    time_french.text("Cette promotion est valable du " + DateUtil.conversionFormat(language, sdf.format(id.getStartTime())) + " au " + DateUtil.conversionFormat(language, sdf.format(id.getEndTime())) + ". Veuillez consulter la plateforme i-go pour plus de détails.");
                 }
 
                 EmailUtil.send(userInfo.getEmail(), language == 1 ? "红包活动" : language == 2 ? "Lucky-promo activities" : "Activités bonus",  document.html());
@@ -1871,10 +2113,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("");
@@ -1890,27 +2136,19 @@
                 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
@@ -1947,10 +2185,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);
+                }
             }
 
 
@@ -2004,36 +2251,36 @@
                                 document.getElementById("french").remove();
                                 document.getElementsByTag("title").get(0).text("I-GO电子收据");
                                 Element title_chinese = document.getElementById("title_chinese");
-                                title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，您在I-GO此订单消费GHS " + orderPrivateCar.getPayMoney());
+                                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 -" + orderPrivateCar.getCouponMoney());
+                                    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 -" + orderPrivateCar.getDiscountMoney());
+                                    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 -" + orderPrivateCar.getRedPacketMoney());
+                                    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.getPayMoney());
+                                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 ? "手机支付" : (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");
@@ -2045,7 +2292,7 @@
                                 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());
@@ -2070,36 +2317,36 @@
                                 document.getElementById("french").remove();
                                 document.getElementsByTag("title").get(0).text("Receipt");
                                 Element title_english = document.getElementById("title_english");
-                                title_english.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，You spent GHS " + orderPrivateCar.getPayMoney() + " on the trip ");
+                                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 -" + orderPrivateCar.getCouponMoney());
+                                    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 -" + orderPrivateCar.getDiscountMoney());
+                                    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 -" + orderPrivateCar.getRedPacketMoney());
+                                    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.getPayMoney());
+                                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 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");
@@ -2111,7 +2358,7 @@
                                 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());
@@ -2136,36 +2383,36 @@
                                 document.getElementById("english").remove();
                                 document.getElementsByTag("title").get(0).text("Reçu");
                                 Element title_french = document.getElementById("title_french");
-                                title_french.text("Le " + DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + ", vous avez dépensé GHS " + orderPrivateCar.getPayMoney() + " sur le voyage");
+                                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 -" + orderPrivateCar.getCouponMoney());
+                                    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 -" + orderPrivateCar.getDiscountMoney());
+                                    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 -" + orderPrivateCar.getRedPacketMoney());
+                                    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.getPayMoney());
+                                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 ? "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");
@@ -2177,7 +2424,7 @@
                                 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: GS " + car.getCarLicensePlate());
@@ -2224,7 +2471,7 @@
                             }
                             try {
                                 FileOutputStream fileOutputStream = new FileOutputStream(file1);
-                                HtmlToPdfUtils.convertToPdf("/usr/local/nginx/html/files/html/ride_receipt_" + id + ".html", "IGO", fileOutputStream);
+                                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异常");
@@ -2367,6 +2614,13 @@
         }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;
     }
 
@@ -2533,4 +2787,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