From 8e680f301f31c91391579213661be4af04810e8c Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期五, 01 八月 2025 10:47:34 +0800 Subject: [PATCH] 特殊区域,价格修改 --- DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java | 76 +++++++++++++++++++++++++++++++++++++ 1 files changed, 75 insertions(+), 1 deletions(-) diff --git a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java index 7dcac04..2127df5 100644 --- a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java +++ b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java @@ -4,8 +4,12 @@ import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableName; import com.baomidou.mybatisplus.enums.IdType; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; +import java.time.LocalDateTime; import java.util.Date; /** @@ -296,7 +300,7 @@ @TableField("passengersPhone") private String passengersPhone; /** - * 订单状态(1=待接单,2=待出发,3=待到达预约地点,4=待乘客上车,5=服务中,6=完成服务,7=待支付,8=待评价,9=已完成,10=已取消,11=改派中,12=取消待支付) + * 订单状态(1=待接单,2=待出发,3=待到达预约地点,4=待乘客上车,5=服务中,6=完成服务,7=待支付,8=待评价,9=已完成,10=已取消,11=改派中,12=取消待支付,13=待改价) */ @TableField("state") private Integer state; @@ -419,6 +423,76 @@ */ private Integer isAbnormal; + @ApiModelProperty(value = "是否异常 1=是 0=否") + @TableField("isException") + private Integer isException; + @ApiModelProperty(value = "修改后的价格") + @TableField("updatePrice") + private BigDecimal updatePrice; + @ApiModelProperty(value = "价格类型 1=原价格 2=预估价 3=修改价") + @TableField("priceType") + private Integer priceType; + @ApiModelProperty(value = "预估价") + @TableField("estimatedPrice") + private BigDecimal estimatedPrice; + + @ApiModelProperty(value = "上一次定位推送时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @TableField("lastPushTime") + private LocalDateTime lastPushTime; + + @ApiModelProperty(value = "修改价格审核 1=待审核 2=通过") + @TableField("priceAuditState") + private Integer priceAuditState; + + public Integer getPriceAuditState() { + return priceAuditState; + } + + public void setPriceAuditState(Integer priceAuditState) { + this.priceAuditState = priceAuditState; + } + + public LocalDateTime getLastPushTime() { + return lastPushTime; + } + + public void setLastPushTime(LocalDateTime lastPushTime) { + this.lastPushTime = lastPushTime; + } + + public Integer getIsException() { + return isException; + } + + public void setIsException(Integer isException) { + this.isException = isException; + } + + public BigDecimal getUpdatePrice() { + return updatePrice; + } + + public void setUpdatePrice(BigDecimal updatePrice) { + this.updatePrice = updatePrice; + } + + public Integer getPriceType() { + return priceType; + } + + public void setPriceType(Integer priceType) { + this.priceType = priceType; + } + + public BigDecimal getEstimatedPrice() { + return estimatedPrice; + } + + public void setEstimatedPrice(BigDecimal estimatedPrice) { + this.estimatedPrice = estimatedPrice; + } + public Integer getIsAbnormal() { return isAbnormal; } -- Gitblit v1.7.1