From f975b6d0832b447654aaf2372ce72f71ebb7f095 Mon Sep 17 00:00:00 2001
From: chenye <chenye0811@qq.com>
Date: 星期二, 11 七月 2023 11:11:55 +0800
Subject: [PATCH] 1
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/order/Order.java | 51 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 45 insertions(+), 6 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/order/Order.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/order/Order.java
index ed30191..989adcd 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/order/Order.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/order/Order.java
@@ -1,16 +1,16 @@
package com.ruoyi.order.domain.pojo.order;
-import java.math.BigDecimal;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
/**
* <p>
@@ -83,6 +83,13 @@
*/
@TableField("receivable_money")
private BigDecimal receivableMoney;
+
+ /**
+ * 应收订金
+ */
+ @TableField("receivable_deposit")
+ private BigDecimal receivableDeposit;
+
/**
* 支付类型1.全款2.订金
*/
@@ -129,6 +136,11 @@
@TableField("use_time")
private Date useTime;
/**
+ * 线下支付时间
+ */
+ @TableField("off_pay_time")
+ private Date offPayTime;
+ /**
* 取消时间
*/
@TableField("cancel_time")
@@ -138,7 +150,34 @@
*/
@TableField("use_user_id")
private Long useUserId;
+ /**
+ * 商品数量
+ */
+ @TableField("goods_num")
+ private Integer goodsNum;
+ /**
+ * 结清标记
+ */
+ @TableField("close_flag")
+ private Integer closeFlag;
+ /**
+ * 活动id
+ */
+ @TableField("activity_id")
+ private Long activityId;
+
+ /**
+ * 活动名称
+ */
+ @TableField("activity_name")
+ private String activityName;
+
+ /**
+ * 应收金额
+ */
+ @TableField("change_receivable_money")
+ private BigDecimal changeReceivableMoney;
@Override
protected Serializable pkVal() {
--
Gitblit v1.7.1