From 6c158ff44edff5dbae1625af5752d0e7462baf8e Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期一, 20 四月 2026 10:11:38 +0800
Subject: [PATCH] 配置 个人中心返回
---
DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml | 6 +++++-
DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/DriverInfoWarpper.java | 44 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 49 insertions(+), 1 deletions(-)
diff --git a/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml b/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml
index dc3f128..3b5bbc8 100644
--- a/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml
+++ b/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml
@@ -559,7 +559,11 @@
((select sum(fraction) from t_order_evaluate where driverId = a.id) / (select count(fraction) from t_order_evaluate where driverId = a.id)) as score,
if((select id from t_merchant where auditStatus = 2 and userType = 2 and userId = a.id and state = 1) is null, 0, 1) as merchant,
a.companyId as companyId,
- e.name as companyName
+ e.name as companyName,
+ e.isCanSelectSeat as isCanSelectSeat,
+ e.isCanModifyAmount as isCanModifyAmount,
+ e.isOfflinePay as isOfflinePay,
+ e.isOpenDriverSelfTrip as isOpenDriverSelfTrip
from t_driver a
left join t_car b on (a.carId = b.id)
left join t_car_model c on (b.carModelId = c.id)
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