From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 01 四月 2025 16:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/order/Order.java | 68 +++++++++++++++++++++++++++++++---
1 files changed, 62 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 eae04e2..fda482f 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>
@@ -48,6 +48,13 @@
*/
@TableField("order_no")
private String orderNo;
+
+ /**
+ * 微信支付交易号
+ */
+ @TableField("out_trade_no")
+ private String outTradeNo;
+
/**
* 订单来源1.商城2.秒杀活动3.线下创建
*/
@@ -136,6 +143,11 @@
@TableField("use_time")
private Date useTime;
/**
+ * 线下支付时间
+ */
+ @TableField("off_pay_time")
+ private Date offPayTime;
+ /**
* 取消时间
*/
@TableField("cancel_time")
@@ -150,6 +162,50 @@
*/
@TableField("goods_num")
private Integer goodsNum;
+ /**
+ * 结清标记
+ */
+ @TableField("close_flag")
+ private Integer closeFlag;
+
+ /**
+ * 活动id
+ */
+ @TableField("activity_id")
+ private String activityId;
+
+ /**
+ * 活动名称
+ */
+ @TableField("activity_name")
+ private String activityName;
+
+ /**
+ * 应收金额
+ */
+ @TableField("change_receivable_money")
+ private BigDecimal changeReceivableMoney;
+
+ /**
+ * @description 获客标记
+ * @author jqs
+ * @date 2023/9/8 10:45
+ * @param null
+ * @return null
+ */
+ @TableField("new_member_flag")
+ private Integer newMemberFlag;
+
+ /**
+ * @description 未绑定标记
+ * @author jqs
+ * @date 2023/9/8 10:45
+ * @param null
+ * @return null
+ */
+ @TableField("unbinding_flag")
+ private Integer unbindingFlag;
+
@Override
protected Serializable pkVal() {
--
Gitblit v1.7.1