From 53562814add61acfdc02d6b25dae6324f6fd5f92 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 18 五月 2023 16:38:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderListWarpper.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderListWarpper.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderListWarpper.java
index f29c02c..0b0a494 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderListWarpper.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderListWarpper.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;
@@ -40,6 +41,8 @@
@ApiModelProperty("支付方式（1=OK平台支付（线上支付），2=其他方式支付（线下支付））")
private Integer payManner;
private Long travelTime;
+ @ApiModelProperty("司机支付状态（现金支付司机代支付）1待支付 2已支付")
+ private Integer driverPay;
public Integer getId() {
return id;
@@ -161,6 +164,14 @@
this.cargoNumber = cargoNumber;
}
+ public Integer getDriverPay() {
+ return driverPay;
+ }
+
+ public void setDriverPay(Integer driverPay) {
+ this.driverPay = driverPay;
+ }
+
@Override
public String toString() {
return "OrderListWarpper{" +
@@ -200,6 +211,7 @@
orderListWarpper.setRemark(null != map.get("remark") ? String.valueOf(map.get("remark")) : "");
orderListWarpper.setPayManner(null != map.get("payManner") ? Integer.valueOf(String.valueOf(map.get("payManner"))) : 0);
orderListWarpper.setTravelTime(null != map.get("travelTime") ? Long.valueOf(String.valueOf(map.get("travelTime"))) : 0);
+ orderListWarpper.setDriverPay(null != map.get("driverPay") ? Integer.valueOf(map.get("driverPay").toString()) : 1);
list.add(orderListWarpper);
}
}
--
Gitblit v1.7.1