From 75a2623173bcc4a235aa1f99f7ef28519186160b Mon Sep 17 00:00:00 2001
From: yanghb <yanghb>
Date: 星期五, 21 四月 2023 11:24:25 +0800
Subject: [PATCH] 代码调整
---
UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/model/OrderLogistics.java | 96 ------------------------------------------------
1 files changed, 0 insertions(+), 96 deletions(-)
diff --git a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/model/OrderLogistics.java b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/model/OrderLogistics.java
index abffb49..268b926 100644
--- a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/model/OrderLogistics.java
+++ b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/model/OrderLogistics.java
@@ -58,12 +58,6 @@
*/
@TableField("cargoNumber")
private Integer cargoNumber;
- //用户上传的图片，多个英文分号分隔
- @TableField("userImg")
- private String userImg;
- //司机上传的图片，多个英文分号分隔
- @TableField("driverImg")
- private String driverImg;
/**
* 备注信息
*/
@@ -194,9 +188,6 @@
*/
@TableField("tipMoney")
private Double tipMoney;
- //节假费
- @TableField("holidayFee")
- private Double holidayFee;
/**
* 红包抵扣金额
*/
@@ -233,21 +224,6 @@
@TableField("activityId")
private Integer activityId;
/**
- * 打折卡id
- */
- @TableField("taxiCardId")
- private Integer taxiCardId;
- /**
- * 打车卡记录id
- */
- @TableField("userTaxiCardId")
- private Integer userTaxiCardId;
- /**
- * 优惠金额
- */
- @TableField("discountAmount")
- private Double discountAmount;
- /**
* 公司id
*/
@TableField("companyId")
@@ -257,9 +233,6 @@
*/
@TableField("payMoney")
private Double payMoney;
- //感谢费
- @TableField("thankYouFee")
- private Double thankYouFee;
/**
* 状态(1=待接单，2=待出发，3=待到达预约地点，4=待取货，5=送货中，6=已送达，7=待支付，8=需补差价，9=已取货，10=已取消，11=已支付差价)
*/
@@ -350,19 +323,6 @@
*/
@TableField("reassignNotice")
private Integer reassignNotice;
- /**
- * 需要送达时间（用户端）
- */
- @TableField("arriveTimeExpect")
- private Date arriveTimeExpect;
-
- public Date getArriveTimeExpect() {
- return arriveTimeExpect;
- }
-
- public void setArriveTimeExpect(Date arriveTimeExpect) {
- this.arriveTimeExpect = arriveTimeExpect;
- }
public Integer getId() {
return id;
@@ -434,22 +394,6 @@
public void setCargoNumber(Integer cargoNumber) {
this.cargoNumber = cargoNumber;
- }
-
- public String getUserImg() {
- return userImg;
- }
-
- public void setUserImg(String userImg) {
- this.userImg = userImg;
- }
-
- public String getDriverImg() {
- return driverImg;
- }
-
- public void setDriverImg(String driverImg) {
- this.driverImg = driverImg;
}
public String getRemark() {
@@ -652,14 +596,6 @@
this.tipMoney = tipMoney;
}
- public Double getHolidayFee() {
- return holidayFee;
- }
-
- public void setHolidayFee(Double holidayFee) {
- this.holidayFee = holidayFee;
- }
-
public Double getRedPacketMoney() {
return redPacketMoney;
}
@@ -692,30 +628,6 @@
this.couponId = couponId;
}
- public Integer getTaxiCardId() {
- return taxiCardId;
- }
-
- public void setTaxiCardId(Integer taxiCardId) {
- this.taxiCardId = taxiCardId;
- }
-
- public Integer getUserTaxiCardId() {
- return userTaxiCardId;
- }
-
- public void setUserTaxiCardId(Integer userTaxiCardId) {
- this.userTaxiCardId = userTaxiCardId;
- }
-
- public Double getDiscountAmount() {
- return discountAmount;
- }
-
- public void setDiscountAmount(Double discountAmount) {
- this.discountAmount = discountAmount;
- }
-
public Integer getCompanyId() {
return companyId;
}
@@ -730,14 +642,6 @@
public void setPayMoney(Double payMoney) {
this.payMoney = payMoney;
- }
-
- public Double getThankYouFee() {
- return thankYouFee;
- }
-
- public void setThankYouFee(Double thankYouFee) {
- this.thankYouFee = thankYouFee;
}
public Integer getState() {
--
Gitblit v1.7.1