From f80d57a352069f27af6ea2b442380c44208e05a3 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 20 四月 2026 11:50:17 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/YueKeDuo
---
DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/DriverInfoWarpper.java | 44 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 44 insertions(+), 0 deletions(-)
diff --git a/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/DriverInfoWarpper.java b/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/DriverInfoWarpper.java
index fd99d5f..7a1177d 100644
--- a/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/DriverInfoWarpper.java
+++ b/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/DriverInfoWarpper.java
@@ -65,6 +65,14 @@
private String networkCarlssueImg;
@ApiModelProperty("是否开通商家（0=否，1=是）")
private Integer merchant;
+ @ApiModelProperty("是否允许线下付款(1=是，2=否)")
+ private Integer isCanSelectSeat;
+ @ApiModelProperty("代客下单是否可修改金额(1=是，2=否)")
+ private Integer isCanModifyAmount;
+ @ApiModelProperty("是否允许线下付款(1=是，2=否)")
+ private Integer isOfflinePay;
+ @ApiModelProperty("是否开启司机自助行程(1=是，2=否)")
+ private Integer isOpenDriverSelfTrip;
public Integer getId() {
return id;
@@ -298,6 +306,38 @@
this.merchant = merchant;
}
+ public Integer getIsCanSelectSeat() {
+ return isCanSelectSeat;
+ }
+
+ public void setIsCanSelectSeat(Integer isCanSelectSeat) {
+ this.isCanSelectSeat = isCanSelectSeat;
+ }
+
+ public Integer getIsCanModifyAmount() {
+ return isCanModifyAmount;
+ }
+
+ public void setIsCanModifyAmount(Integer isCanModifyAmount) {
+ this.isCanModifyAmount = isCanModifyAmount;
+ }
+
+ public Integer getIsOfflinePay() {
+ return isOfflinePay;
+ }
+
+ public void setIsOfflinePay(Integer isOfflinePay) {
+ this.isOfflinePay = isOfflinePay;
+ }
+
+ public Integer getIsOpenDriverSelfTrip() {
+ return isOpenDriverSelfTrip;
+ }
+
+ public void setIsOpenDriverSelfTrip(Integer isOpenDriverSelfTrip) {
+ this.isOpenDriverSelfTrip = isOpenDriverSelfTrip;
+ }
+
@Override
public String toString() {
return "DriverInfoWarpper{" +
@@ -364,6 +404,10 @@
driverInfoWarpper.setLaveActivityMoney(null != map.get("laveActivityMoney") ? Double.valueOf(String.valueOf(map.get("laveActivityMoney"))) : 0);
driverInfoWarpper.setLaveBusinessMoney(null != map.get("laveBusinessMoney") ? Double.valueOf(String.valueOf(map.get("laveBusinessMoney"))) : 0);
driverInfoWarpper.setMerchant(null != map.get("merchant") ? Integer.valueOf(String.valueOf(map.get("merchant"))) : 0);
+ driverInfoWarpper.setIsCanSelectSeat(null != map.get("isCanSelectSeat") ? Integer.valueOf(String.valueOf(map.get("isCanSelectSeat"))) : 2);
+ driverInfoWarpper.setIsCanModifyAmount(null != map.get("isCanModifyAmount") ? Integer.valueOf(String.valueOf(map.get("isCanModifyAmount"))) : 2);
+ driverInfoWarpper.setIsOfflinePay(null != map.get("isOfflinePay") ? Integer.valueOf(String.valueOf(map.get("isOfflinePay"))) : 2);
+ driverInfoWarpper.setIsOpenDriverSelfTrip(null != map.get("isOpenDriverSelfTrip") ? Integer.valueOf(String.valueOf(map.get("isOpenDriverSelfTrip"))) : 2);
}
return driverInfoWarpper;
}
--
Gitblit v1.7.1