From 878ac7cc8e1951bbc7b27619c4e7ece1e3d331ff Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 16 七月 2025 16:41:12 +0800
Subject: [PATCH] 新增加快手团购券核销功能
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/order/Order.java | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 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 3f2ea65..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
@@ -56,7 +56,7 @@
private String outTradeNo;
/**
- * 订单来源1.商城2.秒杀活动3.线下创建
+ * 订单来源1.商城2.秒杀活动3.线下创建4.抽奖
*/
@TableField("order_from")
private Integer orderFrom;
@@ -153,6 +153,11 @@
@TableField("cancel_time")
private Date cancelTime;
/**
+ * 取消方（1=平台，2=商户，3=用户）
+ */
+ @TableField("cancel_type")
+ private Integer cancelType;
+ /**
* 核销用户id
*/
@TableField("use_user_id")
@@ -186,13 +191,35 @@
@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