From dfb1f5ab2e8dc03cf2f497ce3327f6ce58700766 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 23 十月 2025 11:35:55 +0800
Subject: [PATCH] 修改bug
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/ServerCarModelWarpper.java | 115 +++++++++++++++++++++++++++++++--------------------------
1 files changed, 62 insertions(+), 53 deletions(-)
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/ServerCarModelWarpper.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/ServerCarModelWarpper.java
index 3079522..abc2d20 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/ServerCarModelWarpper.java
+++ b/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,28 +18,28 @@
@ApiModelProperty("车型照片")
private String img;
@ApiModelProperty("预估金额-专车对应独享")
- private Double amount;
+ private Map<String, Object> amount;
@ApiModelProperty("包车的价格")
private String price;
@ApiModelProperty("预估里程（公里）")
private Double mileage;
@ApiModelProperty("预估时间（分钟）")
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;
@@ -65,6 +64,8 @@
private JSONObject contentExclusive;//独享
@ApiModelProperty("一口价规则")
private JSONObject contentPrice;//一口价
+ @ApiModelProperty("等待费规则")
+ private JSONObject waitPrice;//等待费
@ApiModelProperty("计价说明（拼车）")
private String fareTypeNote1;
@@ -174,79 +175,79 @@
public void setIsOpenExclusive(Integer isOpenExclusive) {
this.isOpenExclusive = isOpenExclusive;
}
-
+
public Integer getIsOpenPrice() {
return isOpenPrice;
}
-
+
public void setIsOpenPrice(Integer isOpenPrice) {
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;
}
-
+
public Integer getIsOpen() {
return isOpen;
}
-
+
public void setIsOpen(Integer isOpen) {
this.isOpen = isOpen;
}
-
+
public Integer getId() {
return id;
}
@@ -262,31 +263,31 @@
public void setName(String name) {
this.name = name;
}
-
+
public String getImg() {
return img;
}
-
+
public void setImg(String img) {
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;
}
-
+
public String getPrice() {
return price;
}
-
+
public void setPrice(String price) {
this.price = price;
}
-
+
public Double getMileage() {
return mileage;
}
@@ -346,7 +347,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);
@@ -364,4 +364,13 @@
}
return data;
}
+
+
+ public JSONObject getWaitPrice() {
+ return waitPrice;
+ }
+
+ public void setWaitPrice(JSONObject waitPrice) {
+ this.waitPrice = waitPrice;
+ }
}
--
Gitblit v1.7.1