From 49ffecc181ee442546864c0eb78ba9be66cede15 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 09 九月 2023 10:36:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/DriverInfoWarpper.java | 295 +++++++++++++++++++++++++++++++++-------------------------
1 files changed, 169 insertions(+), 126 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/DriverInfoWarpper.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/DriverInfoWarpper.java
index 1bf0f88..d56e1f1 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/DriverInfoWarpper.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/DriverInfoWarpper.java
@@ -11,10 +11,16 @@
private Integer id;
@ApiModelProperty("头像")
private String avatar;
- @ApiModelProperty("姓名")
- private String name;
+ @ApiModelProperty("姓")
+ private String lastName;
+ @ApiModelProperty("名")
+ private String firstName;
+ @ApiModelProperty("手机号码运营商")
+ private String phoneOperator;
@ApiModelProperty("电话")
private String phone;
+ @ApiModelProperty("邮箱")
+ private String email;
@ApiModelProperty("性别")
private Integer sex;
@ApiModelProperty("车牌")
@@ -59,12 +65,16 @@
private String type;
@ApiModelProperty("从业地(带分隔符)")
private String placeOfPractice;
- @ApiModelProperty("从业地行政区域代码")
- private String placeOfEmployment;
+ @ApiModelProperty("从业地id")
+ private String placeOfPracticeId;
@ApiModelProperty("驾驶证照片")
private String driveCardImgUrl;
+ @ApiModelProperty("驾驶证照片")
+ private String driveCardImgUrl2;
@ApiModelProperty("网约车资格证照片")
private String networkCarlssueImg;
+ @ApiModelProperty("语言（1=简体中文，2=英语，3=法语）")
+ private Integer language;
@ApiModelProperty("审核状态(1=待审核，2=正常，3=冻结，4=拒绝)")
private Integer authState;
@@ -84,70 +94,10 @@
private String qrCode;
@ApiModelProperty("二维码是否打开 true打开，false关闭")
private Boolean qrCodeIsOpen;
-
- public Double getLaveBusinessNextWeekMoney() {
- return laveBusinessNextWeekMoney;
- }
-
- public void setLaveBusinessNextWeekMoney(Double laveBusinessNextWeekMoney) {
- this.laveBusinessNextWeekMoney = laveBusinessNextWeekMoney;
- }
-
- public Boolean getQrCodeIsOpen() {
- return qrCodeIsOpen;
- }
-
- public void setQrCodeIsOpen(Boolean qrCodeIsOpen) {
- this.qrCodeIsOpen = qrCodeIsOpen;
- }
-
- public String getQrCode() {
- return qrCode;
- }
-
- public void setQrCode(String qrCode) {
- this.qrCode = qrCode;
- }
-
- public Integer getCarId() {
- return carId;
- }
-
- public void setCarId(Integer carId) {
- this.carId = carId;
- }
-
- public Integer getCarBrandId() {
- return carBrandId;
- }
-
- public void setCarBrandId(Integer carBrandId) {
- this.carBrandId = carBrandId;
- }
-
- public Integer getCarModelId() {
- return carModelId;
- }
-
- public void setCarModelId(Integer carModelId) {
- this.carModelId = carModelId;
- }
-
- public String getDrivingLicensePhoto() {
- return drivingLicensePhoto;
- }
-
- public void setDrivingLicensePhoto(String drivingLicensePhoto) {
- this.drivingLicensePhoto = drivingLicensePhoto;
- }
-
- public Integer getAuthState() {
- return authState;
- }
-
- public void setAuthState(Integer authState) {
- this.authState = authState;
- }
+ @ApiModelProperty("生日")
+ private String birthday;
+ @ApiModelProperty("居住地")
+ private String driverAddress;
public Integer getId() {
return id;
@@ -165,12 +115,44 @@
this.avatar = avatar;
}
- public String getName() {
- return name;
+ public String getLastName() {
+ return lastName;
}
- public void setName(String name) {
- this.name = name;
+ public void setLastName(String lastName) {
+ this.lastName = lastName;
+ }
+
+ public String getFirstName() {
+ return firstName;
+ }
+
+ public void setFirstName(String firstName) {
+ this.firstName = firstName;
+ }
+
+ public String getPhoneOperator() {
+ return phoneOperator;
+ }
+
+ public void setPhoneOperator(String phoneOperator) {
+ this.phoneOperator = phoneOperator;
+ }
+
+ public String getPhone() {
+ return phone;
+ }
+
+ public void setPhone(String phone) {
+ this.phone = phone;
+ }
+
+ public String getEmail() {
+ return email;
+ }
+
+ public void setEmail(String email) {
+ this.email = email;
}
public Integer getSex() {
@@ -229,14 +211,6 @@
this.balance = balance;
}
- public String getPhone() {
- return phone;
- }
-
- public void setPhone(String phone) {
- this.phone = phone;
- }
-
public Double getActivityMoney() {
return activityMoney;
}
@@ -245,12 +219,36 @@
this.activityMoney = activityMoney;
}
+ public Double getLaveActivityMoney() {
+ return laveActivityMoney;
+ }
+
+ public void setLaveActivityMoney(Double laveActivityMoney) {
+ this.laveActivityMoney = laveActivityMoney;
+ }
+
public Double getBusinessMoney() {
return businessMoney;
}
public void setBusinessMoney(Double businessMoney) {
this.businessMoney = businessMoney;
+ }
+
+ public Double getLaveBusinessMoney() {
+ return laveBusinessMoney;
+ }
+
+ public void setLaveBusinessMoney(Double laveBusinessMoney) {
+ this.laveBusinessMoney = laveBusinessMoney;
+ }
+
+ public Double getLaveBusinessNextWeekMoney() {
+ return laveBusinessNextWeekMoney;
+ }
+
+ public void setLaveBusinessNextWeekMoney(Double laveBusinessNextWeekMoney) {
+ this.laveBusinessNextWeekMoney = laveBusinessNextWeekMoney;
}
public String getTaxiAptitudeCard() {
@@ -333,12 +331,28 @@
this.placeOfPractice = placeOfPractice;
}
+ public String getPlaceOfPracticeId() {
+ return placeOfPracticeId;
+ }
+
+ public void setPlaceOfPracticeId(String placeOfPracticeId) {
+ this.placeOfPracticeId = placeOfPracticeId;
+ }
+
public String getDriveCardImgUrl() {
return driveCardImgUrl;
}
public void setDriveCardImgUrl(String driveCardImgUrl) {
this.driveCardImgUrl = driveCardImgUrl;
+ }
+
+ public String getDriveCardImgUrl2() {
+ return driveCardImgUrl2;
+ }
+
+ public void setDriveCardImgUrl2(String driveCardImgUrl2) {
+ this.driveCardImgUrl2 = driveCardImgUrl2;
}
public String getNetworkCarlssueImg() {
@@ -349,62 +363,84 @@
this.networkCarlssueImg = networkCarlssueImg;
}
- public String getPlaceOfEmployment() {
- return placeOfEmployment;
+ public Integer getLanguage() {
+ return language;
}
- public void setPlaceOfEmployment(String placeOfEmployment) {
- this.placeOfEmployment = placeOfEmployment;
+ public void setLanguage(Integer language) {
+ this.language = language;
}
- public Double getLaveActivityMoney() {
- return laveActivityMoney;
+ public Integer getAuthState() {
+ return authState;
}
- public void setLaveActivityMoney(Double laveActivityMoney) {
- this.laveActivityMoney = laveActivityMoney;
+ public void setAuthState(Integer authState) {
+ this.authState = authState;
}
- public Double getLaveBusinessMoney() {
- return laveBusinessMoney;
+ public Integer getCarBrandId() {
+ return carBrandId;
}
- public void setLaveBusinessMoney(Double laveBusinessMoney) {
- this.laveBusinessMoney = laveBusinessMoney;
+ public void setCarBrandId(Integer carBrandId) {
+ this.carBrandId = carBrandId;
}
- @Override
- public String toString() {
- return "DriverInfoWarpper{" +
- "id=" + id +
- ", avatar='" + avatar + '\'' +
- ", name='" + name + '\'' +
- ", phone='" + phone + '\'' +
- ", sex=" + sex +
- ", licensePlate='" + licensePlate + '\'' +
- ", brand='" + brand + '\'' +
- ", carColor='" + carColor + '\'' +
- ", orderNum=" + orderNum +
- ", score=" + score +
- ", balance=" + balance +
- ", activityMoney=" + activityMoney +
- ", laveActivityMoney=" + laveActivityMoney +
- ", businessMoney=" + businessMoney +
- ", laveBusinessMoney=" + laveBusinessMoney +
- ", taxiAptitudeCard='" + taxiAptitudeCard + '\'' +
- ", networkCarlssueDate='" + networkCarlssueDate + '\'' +
- ", company='" + company + '\'' +
- ", driverContactAddress_='" + driverContactAddress_ + '\'' +
- ", idCard='" + idCard + '\'' +
- ", idCardImgUrl1='" + idCardImgUrl1 + '\'' +
- ", idCardImgUrl2='" + idCardImgUrl2 + '\'' +
- ", getDriverLicenseDate='" + getDriverLicenseDate + '\'' +
- ", type='" + type + '\'' +
- ", placeOfPractice='" + placeOfPractice + '\'' +
- ", placeOfEmployment='" + placeOfEmployment + '\'' +
- ", driveCardImgUrl='" + driveCardImgUrl + '\'' +
- ", networkCarlssueImg='" + networkCarlssueImg + '\'' +
- '}';
+ public Integer getCarModelId() {
+ return carModelId;
+ }
+
+ public void setCarModelId(Integer carModelId) {
+ this.carModelId = carModelId;
+ }
+
+ public String getDrivingLicensePhoto() {
+ return drivingLicensePhoto;
+ }
+
+ public void setDrivingLicensePhoto(String drivingLicensePhoto) {
+ this.drivingLicensePhoto = drivingLicensePhoto;
+ }
+
+ public Integer getCarId() {
+ return carId;
+ }
+
+ public void setCarId(Integer carId) {
+ this.carId = carId;
+ }
+
+ public String getQrCode() {
+ return qrCode;
+ }
+
+ public void setQrCode(String qrCode) {
+ this.qrCode = qrCode;
+ }
+
+ public Boolean getQrCodeIsOpen() {
+ return qrCodeIsOpen;
+ }
+
+ public void setQrCodeIsOpen(Boolean qrCodeIsOpen) {
+ this.qrCodeIsOpen = qrCodeIsOpen;
+ }
+
+ public String getBirthday() {
+ return birthday;
+ }
+
+ public void setBirthday(String birthday) {
+ this.birthday = birthday;
+ }
+
+ public String getDriverAddress() {
+ return driverAddress;
+ }
+
+ public void setDriverAddress(String driverAddress) {
+ this.driverAddress = driverAddress;
}
public static DriverInfoWarpper getDriverInfoWarpper(Map<String, Object> map){
@@ -419,8 +455,11 @@
driverInfoWarpper.setAvatar(null != map.get("avatar") ? String.valueOf(map.get("avatar")) : "");
driverInfoWarpper.setQrCode(null != map.get("qrCode") ? String.valueOf(map.get("qrCode")) : "");
driverInfoWarpper.setQrCodeIsOpen(null != map.get("qrCodeIsOpen") ? Boolean.valueOf(map.get("qrCodeIsOpen").toString()) : false);
- driverInfoWarpper.setName(null != map.get("name") ? String.valueOf(map.get("name")) : "");
+ driverInfoWarpper.setLastName(null != map.get("lastName") ? String.valueOf(map.get("lastName")) : "");
+ driverInfoWarpper.setFirstName(null != map.get("firstName") ? String.valueOf(map.get("firstName")) : "");
+ driverInfoWarpper.setPhoneOperator(null != map.get("phoneOperator") ? String.valueOf(map.get("phoneOperator")) : "");
driverInfoWarpper.setPhone(null != map.get("phone") ? String.valueOf(map.get("phone")) : "");
+ driverInfoWarpper.setEmail(null != map.get("email") ? String.valueOf(map.get("email")) : "");
driverInfoWarpper.setSex(null != map.get("sex") ? Integer.valueOf(String.valueOf(map.get("sex"))) : 0);
driverInfoWarpper.setLicensePlate(null != map.get("licensePlate") ? String.valueOf(map.get("licensePlate")) : "");
driverInfoWarpper.setBrand(null != map.get("brand") ? String.valueOf(map.get("brand")) : "");
@@ -441,10 +480,14 @@
driverInfoWarpper.setType(null != map.get("type") ? String.valueOf(map.get("type")) : "");
driverInfoWarpper.setPlaceOfPractice(null != map.get("placeOfPractice") ? String.valueOf(map.get("placeOfPractice")) : "");
driverInfoWarpper.setDriveCardImgUrl(null != map.get("driveCardImgUrl") ? String.valueOf(map.get("driveCardImgUrl")) : "");
+ driverInfoWarpper.setDriveCardImgUrl2(null != map.get("driveCardImgUrl2") ? String.valueOf(map.get("driveCardImgUrl2")) : "");
driverInfoWarpper.setNetworkCarlssueImg(null != map.get("networkCarlssueImg") ? String.valueOf(map.get("networkCarlssueImg")) : "");
- driverInfoWarpper.setPlaceOfEmployment(null != map.get("placeOfEmployment") ? String.valueOf(map.get("placeOfEmployment")) : "");
+ driverInfoWarpper.setPlaceOfPracticeId(null != map.get("placeOfPracticeId") ? String.valueOf(map.get("placeOfPracticeId")) : "");
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.setLanguage(null != map.get("language") ? Integer.valueOf(String.valueOf(map.get("language"))) : 2);
+ driverInfoWarpper.setBirthday(null != map.get("birthday") ? String.valueOf(map.get("birthday")) : "");
+ driverInfoWarpper.setDriverAddress(null != map.get("driverAddress") ? String.valueOf(map.get("driverAddress")) : "");
}
return driverInfoWarpper;
}
--
Gitblit v1.7.1