修改bug

puzhibing

2023-11-04 4becc1e8cdb2fbe0dcb94493b75a59ec1817028c

 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java

@@ -194,6 +194,9 @@
    @Autowired
    private TEmailService emailService;

    @Autowired
    private IPhoneService phoneService;



    /**
@@ -751,6 +754,7 @@
                        PushOrder pushOrder = pushOrderService.querys(i, 1, query.getId()).get(0);
                        //获取空闲司机
                        List<Driver> list = driverService.queryIdleDriver(1, orderPrivateCar.getServerCarModelId(), orderPrivateCar.getStartLon(), orderPrivateCar.getStartLat(), pushOrder.getPushDistance(), null);//所有附近空闲司机
                        System.err.println("【" + orderPrivateCar.getId() + "】空闲司机：" + JSON.toJSONString(list));
                        if(list.size() > 0){
                            double driverProportion = pushOrder.getDriverProportion() / 100;//推送占比计算成小数
                            int lastIndex = Double.valueOf(list.size() * driverProportion).intValue();//计算占比转成整数（下标截取）
@@ -1067,6 +1071,9 @@
                                end_time_chinese.text(sdf2.format(orderPrivateCar.getEndServiceTime()));
                                Element end_address_chinese = document.getElementById("end_address_chinese");
                                end_address_chinese.text(orderPrivateCar.getEndAddress());
                                Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId()));
                                Element server_tel_chinese = document.getElementById("server_tel_chinese");
                                server_tel_chinese.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
                            }
                            if(2 == language){
                                document.getElementById("chinese").remove();
@@ -1108,6 +1115,9 @@
                                end_time_english.text(sdf2.format(orderPrivateCar.getEndServiceTime()));
                                Element end_address_english = document.getElementById("end_address_english");
                                end_address_english.text(orderPrivateCar.getEndAddress());
                                Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId()));
                                Element server_tel_english = document.getElementById("server_tel_english");
                                server_tel_english.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
                            }
                            if(3 == language){
                                document.getElementById("chinese").remove();
@@ -1149,6 +1159,9 @@
                                end_time_french.text(sdf2.format(orderPrivateCar.getEndServiceTime()));
                                Element end_address_french = document.getElementById("end_address_french");
                                end_address_french.text(orderPrivateCar.getEndAddress());
                                Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId()));
                                Element server_tel_french = document.getElementById("server_tel_french");
                                server_tel_french.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
                            }
                            EmailUtil.send(userInfo.getEmail(), language == 1 ? "打车收据" : language == 2 ? "Ride receipt" : "Reçu de Ride",  document.html());

@@ -1367,6 +1380,9 @@
                                end_time_chinese.text(sdf2.format(orderPrivateCar.getEndServiceTime()));
                                Element end_address_chinese = document.getElementById("end_address_chinese");
                                end_address_chinese.text(orderPrivateCar.getEndAddress());
                                Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId()));
                                Element server_tel_chinese = document.getElementById("server_tel_chinese");
                                server_tel_chinese.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
                            }
                            if(2 == language){
                                document.getElementById("chinese").remove();
@@ -1408,6 +1424,9 @@
                                end_time_english.text(sdf2.format(orderPrivateCar.getEndServiceTime()));
                                Element end_address_english = document.getElementById("end_address_english");
                                end_address_english.text(orderPrivateCar.getEndAddress());
                                Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId()));
                                Element server_tel_english = document.getElementById("server_tel_english");
                                server_tel_english.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
                            }
                            if(3 == language){
                                document.getElementById("chinese").remove();
@@ -1449,6 +1468,9 @@
                                end_time_french.text(sdf2.format(orderPrivateCar.getEndServiceTime()));
                                Element end_address_french = document.getElementById("end_address_french");
                                end_address_french.text(orderPrivateCar.getEndAddress());
                                Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId()));
                                Element server_tel_french = document.getElementById("server_tel_french");
                                server_tel_french.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
                            }

                            EmailUtil.send(userInfo.getEmail(), language == 1 ? "打车收据" : language == 2 ? "Ride receipt" : "Reçu de Ride",  document.html());
@@ -1862,6 +1884,9 @@
                                end_time_chinese.text(sdf2.format(orderPrivateCar.getEndServiceTime()));
                                Element end_address_chinese = document.getElementById("end_address_chinese");
                                end_address_chinese.text(orderPrivateCar.getEndAddress());
                                Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId()));
                                Element server_tel_chinese = document.getElementById("server_tel_chinese");
                                server_tel_chinese.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
                            }
                            if(2 == language){
                                document.getElementById("chinese").remove();
@@ -1903,6 +1928,9 @@
                                end_time_english.text(sdf2.format(orderPrivateCar.getEndServiceTime()));
                                Element end_address_english = document.getElementById("end_address_english");
                                end_address_english.text(orderPrivateCar.getEndAddress());
                                Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId()));
                                Element server_tel_english = document.getElementById("server_tel_english");
                                server_tel_english.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
                            }
                            if(3 == language){
                                document.getElementById("chinese").remove();
@@ -1944,6 +1972,9 @@
                                end_time_french.text(sdf2.format(orderPrivateCar.getEndServiceTime()));
                                Element end_address_french = document.getElementById("end_address_french");
                                end_address_french.text(orderPrivateCar.getEndAddress());
                                Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId()));
                                Element server_tel_french = document.getElementById("server_tel_french");
                                server_tel_french.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
                            }

                            EmailUtil.send(userInfo.getEmail(), language == 1 ? "打车收据" : language == 2 ? "Ride receipt" : "Reçu de Ride",  document.html());