From 1af77abfa06a1a0d537bb120ae0c362aae9d3b83 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期三, 30 七月 2025 10:14:40 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/order/Order.java | 77 ++++++++++++++++++++++++++++++++++----
1 files changed, 69 insertions(+), 8 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 fb86dcf..7d88dae 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,8 +48,15 @@
*/
@TableField("order_no")
private String orderNo;
+
/**
- * 订单来源1.商城2.秒杀活动3.线下创建
+ * 微信支付交易号
+ */
+ @TableField("out_trade_no")
+ private String outTradeNo;
+
+ /**
+ * 订单来源1.商城2.秒杀活动3.线下创建4.抽奖
*/
@TableField("order_from")
private Integer orderFrom;
@@ -136,10 +143,20 @@
@TableField("use_time")
private Date useTime;
/**
+ * 线下支付时间
+ */
+ @TableField("off_pay_time")
+ private Date offPayTime;
+ /**
* 取消时间
*/
@TableField("cancel_time")
private Date cancelTime;
+ /**
+ * 取消方（1=平台，2=商户，3=用户）
+ */
+ @TableField("cancel_type")
+ private Integer cancelType;
/**
* 核销用户id
*/
@@ -156,9 +173,53 @@
@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;
+ /**
+ * 三方平台订单id
+ */
+ @TableField("tripartite_order_id")
+ private String tripartiteOrderId;
+
+
@Override
protected Serializable pkVal() {
return this.orderId;
}
-
+
}
--
Gitblit v1.7.1