Merge remote-tracking branch 'origin/master'

Pu Zhibing

8 天以前 a139dba9262dbb4b70f34d3c2034c255561abcad

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java

@@ -458,6 +458,16 @@
                    map = orderCrossCityService.queryOrderInfo(orderId);
                    break;
            }

            if(map.get("companyId") != null){
                Company companyId = companyService.selectById(map.get("companyId").toString());
                map.put("companyName", companyId.getName());
            }else {
                String string = map.get("driverId").toString();
                Driver driver = driverService.selectById(string);
                Company company = companyService.selectById(driver.getCompanyId());
                map.put("companyName", company.getName());
            }
            if(map.get("telX") != null){
                map.put("driverPhone", map.get("telX"));
            }