liujie
18 小时以前 7e0384601e24ff67a8f5ea9bfdf692a64a1064d3
是否包车
2个文件已修改
19 ■■■■■ 已修改文件
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
@@ -1445,7 +1445,12 @@
        if(map.get("abnormalIntro")!=null){
            map.put("appealStatus", 1);
        }
        if(map.get("travelMode")!=null &&map.get("travelMode").toString().equals("2") ){
            map.put("zwNum", 1);
        }else {
            map.put("zwNum", 2);
        }
        Map<String, String> geocode = gdMapGeocodingUtil.geocode(map.get("startLon").toString(), map.get("startLat").toString());
        map.put("startCity", geocode.get("city"));
        geocode = gdMapGeocodingUtil.geocode(map.get("endLon").toString(), map.get("endLat").toString());
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java
@@ -190,6 +190,17 @@
    @ApiModelProperty("公司名称")
    private String companyName;
    @ApiModelProperty("是否包车 1是2否")
    private Integer zwNum;
    public Integer getZwNum() {
        return zwNum;
    }
    public void setZwNum(Integer zwNum) {
        this.zwNum = zwNum;
    }
    public String getCompanyName() {
        return companyName;
    }
@@ -1075,6 +1086,7 @@
            orderInfoWarpper.setAbnormalImg(null != map.get("abnormalImg") ? map.get("abnormalImg").toString() : "");
            orderInfoWarpper.setResponsibilityType(null != map.get("responsibilityType") ? map.get("responsibilityType").toString() : null);
            orderInfoWarpper.setCompanyName(null != map.get("companyName") ? map.get("companyName").toString() : null);
            orderInfoWarpper.setZwNum(null != map.get("zwNum") ? Integer.valueOf(map.get("zwNum").toString()) : null);
            orderInfoWarpper.setOrderAdditionalFeeWarpper(list);
        }
        return orderInfoWarpper;