igo出行
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
Pu Zhibing
6 天以前 4c99ee7028c3fe58a2cd4b8273b22c75c45574fc 
 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java


@@ -503,8 +503,8 @@


            new Thread(new Runnable() {


                @Override


                public void run() {


                    pushUtil.pushOrderState(1, uid, orderPrivateCar.getId(), 1, 2, 0, "");


                    pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, 2, 0, finalAudioUrl);


                    pushUtil.pushOrderState(1, uid, orderPrivateCar.getId(), 1, 2, 0, "", "user");


                    pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, 2, 0, finalAudioUrl, "user");


                }


            }).start();


        }


@@ -638,8 +638,8 @@


                        new Thread(new Runnable() {


                            @Override


                            public void run() {


                                pushUtil.pushOrderState(1, uid, orderPrivateCar.getId(), 1, 2, 0, "");


                                pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, 2, 0, finalAudioUrl);


                                pushUtil.pushOrderState(1, uid, orderPrivateCar.getId(), 1, 2, 0, "", "user");


                                pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, 2, 0, finalAudioUrl, "user");


                            }


                        }).start();


                    }


@@ -917,8 +917,8 @@


                            }


                            break;


                    }


                    pushUtil.pushOrderState(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0, "");


                    pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState() == 12 ? orderPrivateCar.getState() : 10, 0, audioUrl);


                    pushUtil.pushOrderState(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0, "", "user");


                    pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState() == 12 ? orderPrivateCar.getState() : 10, 0, audioUrl, "user");


                    System.err.println("推送取消操作---------------------");


                }


            }).start();


@@ -1084,11 +1084,11 @@


                    }


    


                    this.deleteTask(id);//删除定时任务


                    pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0, "");


                    pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0, "", "user");


                }else{


                    incomeService.saveData(1, orderPrivateCar.getCompanyId(), 3, orderPrivateCar.getId(), 1, amount.doubleValue());


                }


                pushUtil.pushOrderState(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0, "");


                pushUtil.pushOrderState(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0, "", "user");




                //添加消息


                systemNoticeService.addSystemNotice(1, language == 1 ? "您已使用余额成功支付取消订单费用，谢谢使用！" : language == 2


@@ -1190,7 +1190,7 @@


                                    }


                                }, 30000);


                                


                                pushUtil.pushOrderState(2, driver.getId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), pushOrder.getPushTime(), audioUrl);


                                pushUtil.pushOrderState(2, driver.getId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), pushOrder.getPushTime(), audioUrl, "user");


                            }


                        }


                        Thread.sleep(pushOrder.getPushTime() * 1000);//设置等待时间


@@ -1530,6 +1530,7 @@


                                aDouble = orderEvaluateService.queryDriverScore(orderPrivateCar.getDriverId());


                            }


                            Double aDouble1 = new BigDecimal(orderPrivateCar.getMileage()).divide(new BigDecimal(1000)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();


                            Long serviceTime = new BigDecimal(orderPrivateCar.getEndServiceTime().getTime() - orderPrivateCar.getStartServiceTime().getTime()).divide(new BigDecimal(60000)).setScale(0, RoundingMode.HALF_EVEN).longValue();


                            if(1 == language){


                                document.getElementById("english").remove();


                                document.getElementById("french").remove();


@@ -1611,7 +1612,7 @@


                                Element lost_item_chinese = document.getElementById("lost_item_chinese");


                                lost_item_chinese.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=1");


                                Element track_chinese = document.getElementById("track_chinese");


                                track_chinese.attr("href", "https://igo.i-go.group/mailbox/user/location.html?orderId=" + orderId);


                                track_chinese.attr("href", "https://igo.i-go.group/mailbox/user/location.html?orderId=" + orderId + "&language=" + language);


                                Element pay_time_chinese = document.getElementById("pay_time_chinese");


                                pay_time_chinese.text(DateUtil.conversionFormat(language, sdf1.format(orderPrivateCar.getEndServiceTime())));


                                Elements driver_chinese = document.getElementsByClass("driver_chinese");


@@ -1624,7 +1625,7 @@


                                Element pf_chinese = document.getElementById("pf_chinese");


                                pf_chinese.text("司机评分：" + aDouble);


                                Element lc_chinese = document.getElementById("lc_chinese");


                                lc_chinese.text("里程：" + aDouble1 + "公里 /" + orderPrivateCar.getDuration() + "分钟");


                                lc_chinese.text("里程：" + aDouble1 + "公里 /" + serviceTime + "分钟");


                                Element start_time_chinese = document.getElementById("start_time_chinese");


                                start_time_chinese.text(sdf2.format(orderPrivateCar.getTravelTime()));


                                Element start_address_chinese = document.getElementById("start_address_chinese");


@@ -1718,7 +1719,7 @@


                                Element lost_item_english = document.getElementById("lost_item_english");


                                lost_item_english.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=1");


                                Element track_english = document.getElementById("track_english");


                                track_english.attr("href", "https://igo.i-go.group/mailbox/user/location.html?orderId=" + orderId);


                                track_english.attr("href", "https://igo.i-go.group/mailbox/user/location.html?orderId=" + orderId + "&language=" + language);


                                Element pay_time_english = document.getElementById("pay_time_english");


                                pay_time_english.text(DateUtil.conversionFormat(language, sdf1.format(orderPrivateCar.getEndServiceTime())));


                                Elements driver_english = document.getElementsByClass("driver_english");


@@ -1731,7 +1732,7 @@


                                Element pf_english = document.getElementById("pf_english");


                                pf_english.text("Driver Rating：" + aDouble);


                                Element lc_english = document.getElementById("lc_english");


                                lc_english.text("Mileage：" + aDouble1 + "KM / " + orderPrivateCar.getDuration() + "Minutes");


                                lc_english.text("Mileage：" + aDouble1 + "KM / " + serviceTime + "Minutes");


                                Element start_time_english = document.getElementById("start_time_english");


                                start_time_english.text(sdf2.format(orderPrivateCar.getTravelTime()));


                                Element start_address_english = document.getElementById("start_address_english");


@@ -1825,7 +1826,7 @@


                                Element lost_item_french = document.getElementById("lost_item_french");


                                lost_item_french.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=1");


                                Element track_french = document.getElementById("track_french");


                                track_french.attr("href", "https://igo.i-go.group/mailbox/user/location.html?orderId=" + orderId);


                                track_french.attr("href", "https://igo.i-go.group/mailbox/user/location.html?orderId=" + orderId + "&language=" + language);


                                Element pay_time_french = document.getElementById("pay_time_french");


                                pay_time_french.text(DateUtil.conversionFormat(language, sdf1.format(orderPrivateCar.getEndServiceTime())));


                                Elements driver_french = document.getElementsByClass("driver_french");


@@ -1838,7 +1839,7 @@


                                Element pf_french = document.getElementById("pf_french");


                                pf_french.text("Note du chauffeur: " + aDouble);


                                Element lc_french = document.getElementById("lc_french");


                                lc_french.text("Distance: " + aDouble1 + "km / " + orderPrivateCar.getDuration() + "minutes");


                                lc_french.text("Distance: " + aDouble1 + "km / " + serviceTime + "minutes");


                                Element start_time_french = document.getElementById("start_time_french");


                                start_time_french.text(sdf2.format(orderPrivateCar.getTravelTime()));


                                Element start_address_french = document.getElementById("start_address_french");


@@ -1916,8 +1917,8 @@


            new Thread(new Runnable() {


                @Override


                public void run() {


                    pushUtil.pushOrderState(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0, "");


                    pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0, "");


                    pushUtil.pushOrderState(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0, "", "user");


                    pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0, "", "user");


                }


            }).start();


        


@@ -2120,6 +2121,7 @@


                                aDouble = orderEvaluateService.queryDriverScore(orderPrivateCar.getDriverId());


                            }


                            Double aDouble1 = new BigDecimal(orderPrivateCar.getMileage()).divide(new BigDecimal(1000)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();


                            Long serviceTime = new BigDecimal(orderPrivateCar.getEndServiceTime().getTime() - orderPrivateCar.getStartServiceTime().getTime()).divide(new BigDecimal(60000)).setScale(0, RoundingMode.HALF_EVEN).longValue();


                            Driver driver = driverService.selectById(orderPrivateCar.getDriverId());


                            if(1 == language){


                                document.getElementById("english").remove();


@@ -2202,7 +2204,7 @@


                                Element lost_item_chinese = document.getElementById("lost_item_chinese");


                                lost_item_chinese.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=1");


                                Element track_chinese = document.getElementById("track_chinese");


                                track_chinese.attr("href", "https://igo.i-go.group/mailbox/user/location.html?orderId=" + orderId);


                                track_chinese.attr("href", "https://igo.i-go.group/mailbox/user/location.html?orderId=" + orderId + "&language=" + language);


                                Element pay_time_chinese = document.getElementById("pay_time_chinese");


                                pay_time_chinese.text(DateUtil.conversionFormat(language, sdf1.format(orderPrivateCar.getEndServiceTime())));


                                Elements driver_chinese = document.getElementsByClass("driver_chinese");


@@ -2215,7 +2217,7 @@


                                Element pf_chinese = document.getElementById("pf_chinese");


                                pf_chinese.text("司机评分：" + aDouble);


                                Element lc_chinese = document.getElementById("lc_chinese");


                                lc_chinese.text("里程：" + aDouble1 + "公里 /" + orderPrivateCar.getDuration() + "分钟");


                                lc_chinese.text("里程：" + aDouble1 + "公里 /" + serviceTime + "分钟");


                                Element start_time_chinese = document.getElementById("start_time_chinese");


                                start_time_chinese.text(sdf2.format(orderPrivateCar.getTravelTime()));


                                Element start_address_chinese = document.getElementById("start_address_chinese");


@@ -2309,7 +2311,7 @@


                                Element lost_item_english = document.getElementById("lost_item_english");


                                lost_item_english.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=1");


                                Element track_english = document.getElementById("track_english");


                                track_english.attr("href", "https://igo.i-go.group/mailbox/user/location.html?orderId=" + orderId);


                                track_english.attr("href", "https://igo.i-go.group/mailbox/user/location.html?orderId=" + orderId + "&language=" + language);


                                Element pay_time_english = document.getElementById("pay_time_english");


                                pay_time_english.text(DateUtil.conversionFormat(language, sdf1.format(orderPrivateCar.getEndServiceTime())));


                                Elements driver_english = document.getElementsByClass("driver_english");


@@ -2322,7 +2324,7 @@


                                Element pf_english = document.getElementById("pf_english");


                                pf_english.text("Driver Rating：" + aDouble);


                                Element lc_english = document.getElementById("lc_english");


                                lc_english.text("Mileage：" + aDouble1 + "KM / " + orderPrivateCar.getDuration() + "Minutes");


                                lc_english.text("Mileage：" + aDouble1 + "KM / " + serviceTime + "Minutes");


                                Element start_time_english = document.getElementById("start_time_english");


                                start_time_english.text(sdf2.format(orderPrivateCar.getTravelTime()));


                                Element start_address_english = document.getElementById("start_address_english");


@@ -2416,7 +2418,7 @@


                                Element lost_item_french = document.getElementById("lost_item_french");


                                lost_item_french.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=1");


                                Element track_french = document.getElementById("track_french");


                                track_french.attr("href", "https://igo.i-go.group/mailbox/user/location.html?orderId=" + orderId);


                                track_french.attr("href", "https://igo.i-go.group/mailbox/user/location.html?orderId=" + orderId + "&language=" + language);


                                Element pay_time_french = document.getElementById("pay_time_french");


                                pay_time_french.text(DateUtil.conversionFormat(language, sdf1.format(orderPrivateCar.getEndServiceTime())));


                                Elements driver_french = document.getElementsByClass("driver_french");


@@ -2429,7 +2431,7 @@


                                Element pf_french = document.getElementById("pf_french");


                                pf_french.text("Note du chauffeur: " + aDouble);


                                Element lc_french = document.getElementById("lc_french");


                                lc_french.text("Distance: " + aDouble1 + "km / " + orderPrivateCar.getDuration() + "minutes");


                                lc_french.text("Distance: " + aDouble1 + "km / " + serviceTime + "minutes");


                                Element start_time_french = document.getElementById("start_time_french");


                                start_time_french.text(sdf2.format(orderPrivateCar.getTravelTime()));


                                Element start_address_french = document.getElementById("start_address_french");


@@ -2506,8 +2508,8 @@


            new Thread(new Runnable() {


                @Override


                public void run() {


                    pushUtil.pushOrderState(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0, "");


                    pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0, "");


                    pushUtil.pushOrderState(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0, "", "user");


                    pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0, "", "user");


                    Integer language1 = driver.getLanguage();


                    String text = "";


                    switch (language1){


@@ -2768,11 +2770,11 @@


                }


                this.deleteTask(orderPrivateCar.getId());//删除定时任务


    


                pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0, "");


                pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0, "", "user");


            }else{


                incomeService.saveData(1, orderPrivateCar.getCompanyId(), 3, orderPrivateCar.getId(), 1, amount.doubleValue());


            }


            pushUtil.pushOrderState(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0, "");


            pushUtil.pushOrderState(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0, "", "user");




            //添加消息


            systemNoticeService.addSystemNotice(1, language == 1 ? "您已使用余额成功支付取消订单费用，谢谢使用！" : language == 2


@@ -2852,6 +2854,7 @@


                                aDouble = orderEvaluateService.queryDriverScore(orderPrivateCar.getDriverId());


                            }


                            Double aDouble1 = new BigDecimal(orderPrivateCar.getMileage()).divide(new BigDecimal(1000)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();


                            Long serviceTime = new BigDecimal(orderPrivateCar.getEndServiceTime().getTime() - orderPrivateCar.getStartServiceTime().getTime()).divide(new BigDecimal(60000)).setScale(0, RoundingMode.HALF_EVEN).longValue();


                            if(1 == language){


                                document.getElementById("english").remove();


                                document.getElementById("french").remove();


@@ -2933,7 +2936,7 @@


                                Element lost_item_chinese = document.getElementById("lost_item_chinese");


                                lost_item_chinese.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + id + "&orderType=1");


                                Element track_chinese = document.getElementById("track_chinese");


                                track_chinese.attr("href", "https://igo.i-go.group/mailbox/user/location.html?orderId=" + id);


                                track_chinese.attr("href", "https://igo.i-go.group/mailbox/user/location.html?orderId=" + id + "&language=" + language);


                                Element pay_time_chinese = document.getElementById("pay_time_chinese");


                                pay_time_chinese.text(DateUtil.conversionFormat(language, sdf1.format(orderPrivateCar.getEndServiceTime())));


                                Elements driver_chinese = document.getElementsByClass("driver_chinese");


@@ -2946,7 +2949,7 @@


                                Element pf_chinese = document.getElementById("pf_chinese");


                                pf_chinese.text("司机评分：" + aDouble);


                                Element lc_chinese = document.getElementById("lc_chinese");


                                lc_chinese.text("里程：" + aDouble1 + "公里 /" + orderPrivateCar.getDuration() + "分钟");


                                lc_chinese.text("里程：" + aDouble1 + "公里 /" + serviceTime + "分钟");


                                Element start_time_chinese = document.getElementById("start_time_chinese");


                                start_time_chinese.text(sdf2.format(orderPrivateCar.getTravelTime()));


                                Element start_address_chinese = document.getElementById("start_address_chinese");


@@ -3040,7 +3043,7 @@


                                Element lost_item_english = document.getElementById("lost_item_english");


                                lost_item_english.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + id + "&orderType=1");


                                Element track_english = document.getElementById("track_english");


                                track_english.attr("href", "https://igo.i-go.group/mailbox/user/location.html?orderId=" + id);


                                track_english.attr("href", "https://igo.i-go.group/mailbox/user/location.html?orderId=" + id + "&language=" + language);


                                Element pay_time_english = document.getElementById("pay_time_english");


                                pay_time_english.text(DateUtil.conversionFormat(language, sdf1.format(orderPrivateCar.getEndServiceTime())));


                                Elements driver_english = document.getElementsByClass("driver_english");


@@ -3053,7 +3056,7 @@


                                Element pf_english = document.getElementById("pf_english");


                                pf_english.text("Driver Rating：" + aDouble);


                                Element lc_english = document.getElementById("lc_english");


                                lc_english.text("Mileage：" + aDouble1 + "KM / " + orderPrivateCar.getDuration() + "Minutes");


                                lc_english.text("Mileage：" + aDouble1 + "KM / " + serviceTime + "Minutes");


                                Element start_time_english = document.getElementById("start_time_english");


                                start_time_english.text(sdf2.format(orderPrivateCar.getTravelTime()));


                                Element start_address_english = document.getElementById("start_address_english");


@@ -3147,7 +3150,7 @@


                                Element lost_item_french = document.getElementById("lost_item_french");


                                lost_item_french.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + id + "&orderType=1");


                                Element track_french = document.getElementById("track_french");


                                track_french.attr("href", "https://igo.i-go.group/mailbox/user/location.html?orderId=" + id);


                                track_french.attr("href", "https://igo.i-go.group/mailbox/user/location.html?orderId=" + id + "&language=" + language);


                                Element pay_time_french = document.getElementById("pay_time_french");


                                pay_time_french.text(DateUtil.conversionFormat(language, sdf1.format(orderPrivateCar.getEndServiceTime())));


                                Elements driver_french = document.getElementsByClass("driver_french");


@@ -3160,7 +3163,7 @@


                                Element pf_french = document.getElementById("pf_french");


                                pf_french.text("Note du chauffeur: " + aDouble);


                                Element lc_french = document.getElementById("lc_french");


                                lc_french.text("Distance: " + aDouble1 + "km / " + orderPrivateCar.getDuration() + "minutes");


                                lc_french.text("Distance: " + aDouble1 + "km / " + serviceTime + "minutes");


                                Element start_time_french = document.getElementById("start_time_french");


                                start_time_french.text(sdf2.format(orderPrivateCar.getTravelTime()));


                                Element start_address_french = document.getElementById("start_address_french");


@@ -3237,8 +3240,8 @@


            new Thread(new Runnable() {


                @Override


                public void run() {


                    pushUtil.pushOrderState(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0, "");


                    pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0, "");


                    pushUtil.pushOrderState(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0, "", "user");


                    pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0, "", "user");


                }


            }).start();