From 2de95b175c2a68d7ce28fb453204b602a1a8fdb8 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 06 五月 2024 17:57:32 +0800
Subject: [PATCH] 合并代码
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderListWarpper.java | 38 ++++++++++++++++++++++++++++++++++++--
1 files changed, 36 insertions(+), 2 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..960ba12 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;
@@ -26,8 +27,8 @@
private Double redMoney;
@ApiModelProperty("订单金额")
private Double orderMoney;
- @ApiModelProperty("订单状态(1=待接单，2=待出发，3=待到达预约地点，4=待乘客上车，5=服务中，6=完成服务，7=待支付，8=待评价，9=已完成，10=已取消，11=改派中)<br/>" +
- "小件物流订单状态（1=待接单，2=待出发，3=待到达预约地点，4=待取货，5=送货中，6=已送达，7=待支付，8=需补差价，9=已取货，10=已取消，11=已支付差价）")
+ @ApiModelProperty("订单状态(1=待接单，2=待出发，3=待到达预约地点，4=待乘客上车，5=服务中，6=完成服务，7=待支付，8=待评价，9=已完成，10=已取消，11=改派中，12=取消待支付)<br/>" +
+ "小件物流订单状态（1=待接单，2=待出发，3=待到达预约地点，4=待乘客上车，5=服务中，6=完成服务，7=待支付，8=待评价，9=已完成，10=已取消，11=改派中，12=取消待支付，13=补差价）")
private Integer state;
@ApiModelProperty("人数")
private Integer peopleNumber;
@@ -40,6 +41,12 @@
@ApiModelProperty("支付方式（1=OK平台支付（线上支付），2=其他方式支付（线下支付））")
private Integer payManner;
private Long travelTime;
+ @ApiModelProperty("司机支付状态（现金支付司机代支付）1待支付 2已支付")
+ private Integer driverPay;
+ @ApiModelProperty("中途取消（0=否，1=是）")
+ private Integer cancelMidway;
+ @ApiModelProperty("结算状态（0=否，1=是）")
+ private Integer settleAccounts;
public Integer getId() {
return id;
@@ -161,6 +168,30 @@
this.cargoNumber = cargoNumber;
}
+ public Integer getDriverPay() {
+ return driverPay;
+ }
+
+ public void setDriverPay(Integer driverPay) {
+ this.driverPay = driverPay;
+ }
+
+ public Integer getCancelMidway() {
+ return cancelMidway;
+ }
+
+ public void setCancelMidway(Integer cancelMidway) {
+ this.cancelMidway = cancelMidway;
+ }
+
+ public Integer getSettleAccounts() {
+ return settleAccounts;
+ }
+
+ public void setSettleAccounts(Integer settleAccounts) {
+ this.settleAccounts = settleAccounts;
+ }
+
@Override
public String toString() {
return "OrderListWarpper{" +
@@ -200,6 +231,9 @@
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);
+ orderListWarpper.setCancelMidway(null != map.get("cancelMidway") ? Integer.valueOf(map.get("cancelMidway").toString()) : 0);
+ orderListWarpper.setSettleAccounts(null != map.get("settleAccounts") ? Integer.valueOf(map.get("settleAccounts").toString()) : 0);
list.add(orderListWarpper);
}
}
--
Gitblit v1.7.1