From bfa0b11dfbfe5b71e11f4544e688e4d9f325d1b5 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 09 六月 2025 10:26:51 +0800
Subject: [PATCH] 修改bug和管理后台报表
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java | 66 ++++++++++++++++++++++++++++++---
1 files changed, 60 insertions(+), 6 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 f217a1f..bf81f07 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;
@@ -11,8 +12,7 @@
public class OrderInfoWarpper {
@ApiModelProperty("订单id")
private Integer orderId;
- @ApiModelProperty("1=待接单，2=待出发，3=待到达预约地点，4=待乘客上车，5=服务中，6=完成服务，7=待支付，8=待评价，9=已完成，10=已取消，11=改派中)<br/>" +
- "小件物流订单状态（状态(1=待接单，2=待出发，3=待到达预约地点，4=待乘客上车，5=服务中，6=完成服务，7=待支付，8=待评价，9=已完成，10=已取消，11=改派中，12=取消待支付，13=补差价)）")
+ @ApiModelProperty("状态(1=待接单，2=待出发，3=待到达预约地点，4=待乘客上车，5=服务中，6=完成服务，7=待支付，8=待评价，9=已完成，10=已取消，11=改派中，12=取消待支付，13=补差价)")
private Integer orderState;
@ApiModelProperty("订单名称")
private String orderName;
@@ -50,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 +96,16 @@
@ApiModelProperty("是否冻结（1=否，2=是）")
private Integer isFrozen;
@ApiModelProperty("超时取消时间")
- private Integer timeOutCancel;
+ private Long timeOutCancel;
+ @ApiModelProperty("超时语音文件地址")
+ private String audioUrl;
@ApiModelProperty("接单时间")
private String snatchOrderTime;
+ private String tripId;
+ @ApiModelProperty("中途取消（0=否，1=是）")
+ private Integer cancelMidway;
+ @ApiModelProperty("争议订单（0=否，1=是）")
+ private Integer isDispute;
public Integer getStartDuration() {
return startDuration;
@@ -426,11 +435,11 @@
this.isFrozen = isFrozen;
}
- public Integer getTimeOutCancel() {
+ public Long getTimeOutCancel() {
return timeOutCancel;
}
- public void setTimeOutCancel(Integer timeOutCancel) {
+ public void setTimeOutCancel(Long timeOutCancel) {
this.timeOutCancel = timeOutCancel;
}
@@ -448,6 +457,46 @@
public void setUserPhone(String userPhone) {
this.userPhone = userPhone;
+ }
+
+ public String getTripId() {
+ return tripId;
+ }
+
+ public void setTripId(String tripId) {
+ 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;
+ }
+
+ public Integer getIsDispute() {
+ return isDispute;
+ }
+
+ public void setIsDispute(Integer isDispute) {
+ this.isDispute = isDispute;
}
@Override
@@ -535,9 +584,14 @@
orderInfoWarpper.setUserName(null != map.get("userName") ? String.valueOf(map.get("userName")) : "");
orderInfoWarpper.setDriverPay(null != map.get("driverPay") ? Integer.valueOf(map.get("driverPay").toString()) : 0);
orderInfoWarpper.setIsFrozen(null != map.get("isFrozen") ? Integer.valueOf(map.get("isFrozen").toString()) : 1);
- orderInfoWarpper.setTimeOutCancel(null != map.get("timeOutCancel") ? Integer.valueOf(map.get("timeOutCancel").toString()) : 0);
+ orderInfoWarpper.setTimeOutCancel(null != map.get("timeOutCancel") ? Long.valueOf(map.get("timeOutCancel").toString()) : 0);
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);
+ orderInfoWarpper.setIsDispute(null != map.get("isDispute") ? Integer.valueOf(map.get("isDispute").toString()) : 0);
}
return orderInfoWarpper;
}
--
Gitblit v1.7.1