From 8b09fbc19a96b57bf1d0e4d7c79b51a76aeca554 Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期五, 28 三月 2025 19:57:56 +0800 Subject: [PATCH] 修改bug --- ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderLogistics.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 50 insertions(+), 9 deletions(-) diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderLogistics.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderLogistics.java index 27b0be7..c6facc8 100644 --- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderLogistics.java +++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderLogistics.java @@ -1,11 +1,14 @@ package com.stylefeng.guns.modular.system.model; +import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.enums.IdType; import java.math.BigDecimal; import java.util.Date; import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.activerecord.Model; import com.baomidou.mybatisplus.annotations.TableName; +import lombok.Data; + import java.io.Serializable; /** @@ -17,6 +20,7 @@ * @since 2020-09-24 */ @TableName("t_order_logistics") +@Data public class TOrderLogistics extends Model<TOrderLogistics> { private static final long serialVersionUID = 1L; @@ -169,7 +173,7 @@ /** * 红包记录id */ - private Integer redPacketId; + private String redPacketId; /** * 优惠券id */ @@ -254,6 +258,18 @@ * 移动小号绑定关系id */ private String bindId; + + private String tripId; + /** + * google行程结束标识-是否结束(0=否,1=是) + */ + @TableField("isover") + private Integer isover; + /** + * 争议订单(0=否,1=是) + */ + @TableField("isDispute") + private Integer isDispute; public Integer getOldState() { return oldState; @@ -551,13 +567,6 @@ this.couponMoney = couponMoney; } - public Integer getRedPacketId() { - return redPacketId; - } - - public void setRedPacketId(Integer redPacketId) { - this.redPacketId = redPacketId; - } public Integer getCouponId() { return couponId; @@ -718,7 +727,39 @@ public void setBindId(String bindId) { this.bindId = bindId; } - + + public String getTripId() { + return tripId; + } + + public void setTripId(String tripId) { + this.tripId = tripId; + } + + public String getRedPacketId() { + return redPacketId; + } + + public void setRedPacketId(String redPacketId) { + this.redPacketId = redPacketId; + } + + public Integer getIsDispute() { + return isDispute; + } + + public void setIsDispute(Integer isDispute) { + this.isDispute = isDispute; + } + + public Integer getIsover() { + return isover; + } + + public void setIsover(Integer isover) { + this.isover = isover; + } + @Override protected Serializable pkVal() { return this.id; -- Gitblit v1.7.1