Merge remote-tracking branch 'origin/master'

Pu Zhibing

7 天以前 a139dba9262dbb4b70f34d3c2034c255561abcad

Merge remote-tracking branch 'origin/master'

 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"));
            }

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/mapping/OrderCrossCityMapper.xml

@@ -354,7 +354,8 @@
        a.abnormalStatus,
        a.abnormalRemark,
        a.abnormalIntro,
        a.abnormalImg
        a.abnormalImg,
        a.companyId
        from t_order_cross_city a
        left join t_driver b on (a.driverId = b.id)
        left join t_car c on (a.carId = c.id)

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml

@@ -390,7 +390,8 @@
        a.abnormalStatus,
        a.abnormalRemark,
        a.abnormalIntro,
        a.abnormalImg
        a.abnormalImg,
        a.companyId
        from t_order_private_car a
        left join t_driver b on (a.driverId = b.id)
        left join t_car c on (a.carId = c.id)

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java

@@ -187,6 +187,17 @@
    private String responsibilityType;


    @ApiModelProperty("公司名称")
    private String companyName;

    public String getCompanyName() {
        return companyName;
    }

    public void setCompanyName(String companyName) {
        this.companyName = companyName;
    }

    public Integer getAbnormalStatus() {
        return abnormalStatus;
    }

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/dao/mapping/OrderTaxiMapper.xml

@@ -263,7 +263,8 @@
        a.abnormalStatus,
        a.abnormalRemark,
        a.abnormalIntro,
        a.abnormalImg
        a.abnormalImg,
        a.companyId
        from t_order_taxi a
        left join t_driver b on (a.driverId = b.id)
        left join t_car c on (a.carId = c.id)