Merge remote-tracking branch 'origin/master'

guyue

4 天以前 0fc5865ab5f1df62cb948fbb97c2207b5bd855f9

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

@@ -167,6 +167,93 @@

    private String time;


    @ApiModelProperty("申诉按钮 1显示 0不显示")
    private Integer appealButton=0;

    @ApiModelProperty("申诉状态 0未申诉 1申诉中")
    private Integer appealStatus=0;


    @ApiModelProperty("处理状态 1审核中 2已处理")
    private Integer abnormalStatus;
    @ApiModelProperty("处理结果")
    private String abnormalRemark;
    @ApiModelProperty("乘客反馈情况")
    private String abnormalIntro;
    @ApiModelProperty("乘客反馈情况图片")
    private String abnormalImg;
    @ApiModelProperty("1平台全责 2司机全责 3乘客全责 4平台部分 5司机部分")
    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;
    }

    public void setAbnormalStatus(Integer abnormalStatus) {
        this.abnormalStatus = abnormalStatus;
    }

    public String getAbnormalRemark() {
        return abnormalRemark;
    }

    public void setAbnormalRemark(String abnormalRemark) {
        this.abnormalRemark = abnormalRemark;
    }

    public String getAbnormalIntro() {
        return abnormalIntro;
    }

    public void setAbnormalIntro(String abnormalIntro) {
        this.abnormalIntro = abnormalIntro;
    }

    public String getAbnormalImg() {
        return abnormalImg;
    }

    public void setAbnormalImg(String abnormalImg) {
        this.abnormalImg = abnormalImg;
    }

    public String getResponsibilityType() {
        return responsibilityType;
    }

    public void setResponsibilityType(String responsibilityType) {
        this.responsibilityType = responsibilityType;
    }

    public Integer getAppealStatus() {
        return appealStatus;
    }

    public void setAppealStatus(Integer appealStatus) {
        this.appealStatus = appealStatus;
    }

    public Integer getAppealButton() {
        return appealButton;
    }

    public void setAppealButton(Integer appealButton) {
        this.appealButton = appealButton;
    }

    public String getTime() {
        return time;
    }
@@ -980,6 +1067,14 @@
            orderInfoWarpper.setLineShiftTime(null != map.get("lineShiftTime") ? map.get("lineShiftTime").toString() : "");
            orderInfoWarpper.setHolidayFee(null != map.get("holidayFee") ? Double.valueOf(map.get("holidayFee").toString()) : 0);
            orderInfoWarpper.setTaxiCardMoney(null != map.get("taxiCardMoney") ? Double.valueOf(map.get("taxiCardMoney").toString()) : 0);
            orderInfoWarpper.setAppealButton(null != map.get("appealButton") ? Integer.valueOf(map.get("appealButton").toString()) : 0);
            orderInfoWarpper.setAppealStatus(null != map.get("appealStatus") ? Integer.valueOf(map.get("appealStatus").toString()) : 0);
            orderInfoWarpper.setAbnormalStatus(Integer.valueOf(map.get("abnormalStatus").toString()));
            orderInfoWarpper.setAbnormalRemark(null != map.get("abnormalRemark") ? map.get("abnormalRemark").toString() : "");
            orderInfoWarpper.setAbnormalIntro(null != map.get("abnormalIntro") ? map.get("abnormalIntro").toString() : "");
            orderInfoWarpper.setAbnormalImg(null != map.get("abnormalImg") ? map.get("abnormalImg").toString() : "");
            orderInfoWarpper.setResponsibilityType(null != map.get("responsibilityType") ? map.get("abnormalImg").toString() : null);
            orderInfoWarpper.setCompanyName(null != map.get("companyName") ? map.get("companyName").toString() : null);
            orderInfoWarpper.setOrderAdditionalFeeWarpper(list);
        }
        return orderInfoWarpper;