Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong

liujie

6 天以前 729a5a0592cac7750e8b476c5fcb25bfc3ff8d25

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

@@ -1,7 +1,6 @@
package com.stylefeng.guns.modular.system.warpper;


import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -19,7 +18,7 @@
    @ApiModelProperty("车型照片")
    private String img;
    @ApiModelProperty("预估金额-专车对应独享")
    private Double amount;
    private Map<String, Object> amount;
    @ApiModelProperty("包车的价格")
    private String price;
    @ApiModelProperty("预估里程（公里）")
@@ -28,19 +27,19 @@
    private Double duration;

    @ApiModelProperty("预估金额-专车对应一口价")
    private Double buyNowAmount;
    private Map<String, Object> buyNowAmount;
    @ApiModelProperty("预估金额-专车对应一人拼成价格")
    private Double putTogetherOneAmount;
    private Map<String, Object> putTogetherOneAmount;
    @ApiModelProperty("预估金额-专车对应一人未拼成价格")
    private Double notAssembledOneAmount;
    private Map<String, Object> notAssembledOneAmount;
    @ApiModelProperty("预估金额-专车对应两人拼成价格")
    private Double putTogetherTwoAmount;
    private Map<String, Object> putTogetherTwoAmount;
    @ApiModelProperty("预估金额-专车对应两人未拼成价格")
    private Double notAssembledTwoAmount;
    private Map<String, Object> notAssembledTwoAmount;
    @ApiModelProperty("预估金额-专车对应三人拼成价格")
    private Double putTogetherThreeAmount;
    private Map<String, Object> putTogetherThreeAmount;
    @ApiModelProperty("预估金额-专车对应三人未拼成价格")
    private Double notAssembledThreeAmount;
    private Map<String, Object> notAssembledThreeAmount;
    @ApiModelProperty("是否开启拼车(1=是，2=否）")
    private Integer isOpen;

@@ -183,59 +182,59 @@
        this.isOpenPrice = isOpenPrice;
    }

    public Double getBuyNowAmount() {
    public Map<String, Object> getBuyNowAmount() {
        return buyNowAmount;
    }

    public void setBuyNowAmount(Double buyNowAmount) {
    public void setBuyNowAmount(Map<String, Object> buyNowAmount) {
        this.buyNowAmount = buyNowAmount;
    }

    public Double getPutTogetherOneAmount() {
    public Map<String, Object> getPutTogetherOneAmount() {
        return putTogetherOneAmount;
    }

    public void setPutTogetherOneAmount(Double putTogetherOneAmount) {
    public void setPutTogetherOneAmount(Map<String, Object> putTogetherOneAmount) {
        this.putTogetherOneAmount = putTogetherOneAmount;
    }

    public Double getNotAssembledOneAmount() {
    public Map<String, Object> getNotAssembledOneAmount() {
        return notAssembledOneAmount;
    }

    public void setNotAssembledOneAmount(Double notAssembledOneAmount) {
    public void setNotAssembledOneAmount(Map<String, Object> notAssembledOneAmount) {
        this.notAssembledOneAmount = notAssembledOneAmount;
    }

    public Double getPutTogetherTwoAmount() {
    public Map<String, Object> getPutTogetherTwoAmount() {
        return putTogetherTwoAmount;
    }

    public void setPutTogetherTwoAmount(Double putTogetherTwoAmount) {
    public void setPutTogetherTwoAmount(Map<String, Object> putTogetherTwoAmount) {
        this.putTogetherTwoAmount = putTogetherTwoAmount;
    }

    public Double getNotAssembledTwoAmount() {
    public Map<String, Object> getNotAssembledTwoAmount() {
        return notAssembledTwoAmount;
    }

    public void setNotAssembledTwoAmount(Double notAssembledTwoAmount) {
    public void setNotAssembledTwoAmount(Map<String, Object> notAssembledTwoAmount) {
        this.notAssembledTwoAmount = notAssembledTwoAmount;
    }

    public Double getPutTogetherThreeAmount() {
    public Map<String, Object> getPutTogetherThreeAmount() {
        return putTogetherThreeAmount;
    }

    public void setPutTogetherThreeAmount(Double putTogetherThreeAmount) {
    public void setPutTogetherThreeAmount(Map<String, Object> putTogetherThreeAmount) {
        this.putTogetherThreeAmount = putTogetherThreeAmount;
    }

    public Double getNotAssembledThreeAmount() {
    public Map<String, Object> getNotAssembledThreeAmount() {
        return notAssembledThreeAmount;
    }

    public void setNotAssembledThreeAmount(Double notAssembledThreeAmount) {
    public void setNotAssembledThreeAmount(Map<String, Object> notAssembledThreeAmount) {
        this.notAssembledThreeAmount = notAssembledThreeAmount;
    }

@@ -271,11 +270,11 @@
        this.img = img;
    }

    public Double getAmount() {
    public Map<String, Object> getAmount() {
        return amount;
    }

    public void setAmount(Double amount) {
    public void setAmount(Map<String, Object> amount) {
        this.amount = amount;
    }

@@ -346,7 +345,6 @@
            serverCarModelWarpper.setId(null != map.get("id") ? Integer.valueOf(map.get("id").toString()) : 0);
            serverCarModelWarpper.setName(null != map.get("name") ? map.get("name").toString() : "");
            serverCarModelWarpper.setImg(null != map.get("img") ? map.get("img").toString() : "");
            serverCarModelWarpper.setAmount(null != map.get("amount") ? Double.valueOf(map.get("amount").toString()) : 0);
            serverCarModelWarpper.setPrice(null != map.get("price") ? map.get("price").toString() : "");
            serverCarModelWarpper.setMileage(null != map.get("mileage") ? Double.valueOf(map.get("mileage").toString()) : 0);
            serverCarModelWarpper.setDuration(null != map.get("duration") ? Double.valueOf(map.get("duration").toString()) : 0);