From 8dd61e711d7cccd7d8d1278ab79a73e7a41aad4d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 01 二月 2024 08:50:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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 b19ef16..0725bd8 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
@@ -8,7 +8,7 @@
import java.util.List;
import java.util.Map;
-@ApiModel("订单详情")
+@ApiModel("订单详情22")
public class OrderInfoWarpper {
@ApiModelProperty("订单id")
private Integer orderId;
@@ -49,7 +49,7 @@
private Integer historyNum;
@ApiModelProperty("订单总金额")
private Double orderMoney;
- @ApiModelProperty("支付方式（1=OK平台支付（线上支付），2=其他方式支付（线下支付））")
+ @ApiModelProperty(value = "支付方式（1=OK平台支付（线上支付），2=其他方式支付（线下支付））11111", example = "1")
private Integer payManner;
@ApiModelProperty("支付金额")
private Double payMoney;
@@ -85,6 +85,8 @@
private Integer urgent;
@ApiModelProperty("下单用户姓名")
private String userName;
+ @ApiModelProperty("司机支付状态【现金支付需要司机代支付】（1=待支付，2=已支付）")
+ private Integer driverPay;
@ApiModelProperty("轨迹")
private String orderPositionList;
@@ -403,6 +405,14 @@
this.userName = userName;
}
+ public Integer getDriverPay() {
+ return driverPay;
+ }
+
+ public void setDriverPay(Integer driverPay) {
+ this.driverPay = driverPay;
+ }
+
@Override
public String toString() {
return "OrderInfoWarpper{" +
@@ -486,6 +496,7 @@
orderInfoWarpper.setCargoType(null != map.get("cargoType") ? Integer.valueOf(map.get("cargoType").toString()) : 0);
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);
}
return orderInfoWarpper;
}
--
Gitblit v1.7.1