From 79d97c39f1d118824f91467feb9f4a55717fd0c0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 26 七月 2024 14:03:41 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java
index e299a92..caf4c2e 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java
@@ -1,5 +1,6 @@
package com.stylefeng.guns.modular.system.warpper;
+import com.baomidou.mybatisplus.annotations.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -49,6 +50,8 @@
private Double orderMoney;
@ApiModelProperty(value = "支付方式（1=OK平台支付（线上支付），2=其他方式支付（线下支付））", example = "1")
private Integer payManner;
+ @ApiModelProperty("小件物流差价")
+ private Double priceDifference;
@ApiModelProperty("支付金额")
private Double payMoney;
@ApiModelProperty("是否是改派单（1=否，2=是）")
@@ -94,9 +97,13 @@
private Integer isFrozen;
@ApiModelProperty("超时取消时间")
private Integer timeOutCancel;
+ @ApiModelProperty("超时语音文件地址")
+ private String audioUrl;
@ApiModelProperty("接单时间")
private String snatchOrderTime;
private String tripId;
+ @ApiModelProperty("中途取消（0=否，1=是）")
+ private Integer cancelMidway;
public Integer getStartDuration() {
return startDuration;
@@ -458,6 +465,30 @@
this.tripId = tripId;
}
+ public Integer getCancelMidway() {
+ return cancelMidway;
+ }
+
+ public void setCancelMidway(Integer cancelMidway) {
+ this.cancelMidway = cancelMidway;
+ }
+
+ public String getAudioUrl() {
+ return audioUrl;
+ }
+
+ public void setAudioUrl(String audioUrl) {
+ this.audioUrl = audioUrl;
+ }
+
+ public Double getPriceDifference() {
+ return priceDifference;
+ }
+
+ public void setPriceDifference(Double priceDifference) {
+ this.priceDifference = priceDifference;
+ }
+
@Override
public String toString() {
return "OrderInfoWarpper{" +
@@ -547,6 +578,9 @@
orderInfoWarpper.setSnatchOrderTime(null != map.get("snatchOrderTime") ? map.get("snatchOrderTime").toString() : "");
orderInfoWarpper.setUserPhone(null != map.get("userPhone") ? map.get("userPhone").toString() : "");
orderInfoWarpper.setTripId(null != map.get("tripId") ? map.get("tripId").toString() : "");
+ orderInfoWarpper.setCancelMidway(null != map.get("cancelMidway") ? Integer.valueOf(map.get("cancelMidway").toString()) : 0);
+ orderInfoWarpper.setAudioUrl(null != map.get("audioUrl") ? map.get("audioUrl").toString() : "");
+ orderInfoWarpper.setPriceDifference(null != map.get("priceDifference") ? Double.valueOf(map.get("priceDifference").toString()) : 0);
}
return orderInfoWarpper;
}
--
Gitblit v1.7.1