From 9b51a95fa8bc9b3a86108c6900e17fc55f8db467 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 19 May 2025 17:02:07 +0800
Subject: [PATCH] refactor(vip): 优化积分和返佣计算逻辑
---
src/main/java/cc/mrbird/febs/mall/entity/HappyActivityOrder.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/entity/HappyActivityOrder.java b/src/main/java/cc/mrbird/febs/mall/entity/HappyActivityOrder.java
index c815c20..7030df2 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/HappyActivityOrder.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/HappyActivityOrder.java
@@ -1,6 +1,7 @@
package cc.mrbird.febs.mall.entity;
import cc.mrbird.febs.common.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
@@ -25,6 +26,8 @@
`order_no` varchar(32) DEFAULT NULL COMMENT '订单号',
`pay_order_no` text COMMENT '支付订单号',
`wx_order_no` varchar(100) DEFAULT NULL COMMENT '微信订单编号',
+ `state` int(11) DEFAULT '1' COMMENT '订单状态 1-待支付 2-待使用 3-已使用 4-售后',
+ `fail_time` datetime DEFAULT NULL COMMENT '失效时间',
*/
@@ -40,4 +43,13 @@
private String orderNo;
private String payOrderNo;
private String wxOrderNo;
+ private Integer state;
+ private Date failTime;
+
+
+ @TableField(exist = false)
+ private String name;//
+
+ @TableField(exist = false)
+ private String activityName;//
}
--
Gitblit v1.9.1