From 2e366b939271b6ea338641f8a72d1bcd2182dbe7 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期五, 19 四月 2024 17:56:18 +0800
Subject: [PATCH] 新增加功能
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 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 7589abb..5cc1be0 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,12 +1,9 @@
package com.stylefeng.guns.modular.system.warpper;
-import com.stylefeng.guns.modular.system.model.OrderPosition;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import java.util.ArrayList;
-import java.util.List;
import java.util.Map;
@ApiModel("订单详情22")
@@ -55,8 +52,6 @@
private Integer payManner;
@ApiModelProperty("支付金额")
private Double payMoney;
-
-
@ApiModelProperty("是否是改派单（1=否，2=是）")
private Integer isReassign;
@ApiModelProperty("高德猎鹰轨迹id(订单开始后需要上传坐标到指定轨迹中)")
@@ -91,11 +86,11 @@
private String userName;
@ApiModelProperty("司机支付状态【现金支付需要司机代支付】（1=待支付，2=已支付）")
private Integer driverPay;
-
@ApiModelProperty("轨迹")
private String orderPositionList;
-
private Integer startDuration;
+ @ApiModelProperty("是否冻结（1=否，2=是）")
+ private Integer isFrozen;
public Integer getStartDuration() {
return startDuration;
@@ -416,7 +411,15 @@
public void setDriverPay(Integer driverPay) {
this.driverPay = driverPay;
}
-
+
+ public Integer getIsFrozen() {
+ return isFrozen;
+ }
+
+ public void setIsFrozen(Integer isFrozen) {
+ this.isFrozen = isFrozen;
+ }
+
@Override
public String toString() {
return "OrderInfoWarpper{" +
@@ -501,6 +504,7 @@
orderInfoWarpper.setUrgent(null != map.get("urgent") ? Integer.valueOf(map.get("urgent").toString()) : 0);
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);
}
return orderInfoWarpper;
}
--
Gitblit v1.7.1