From df864d1d636751424fd642d3bdd33c53cf63500d Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 07 Jul 2025 17:51:09 +0800
Subject: [PATCH] feat(mall): 为活动订单项添加积分和成长值奖 - 在活动添加和编辑页面增加积分和成长值输入字段 - 更新活动实体类，添加 scoreCnt 和 growthCnt 字段 - 修改活动订单项处理逻辑，增加积分和成长值奖励的计算和发放 - 优化活动订单项状态检查逻辑，移除冗余代码
---
src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java b/src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java
index cef66a2..e9d1bc5 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java
@@ -25,6 +25,8 @@
private Date orderTime;
private Date payTime;
+ //支付积分
+ private BigDecimal scoreAmount;
private BigDecimal amount;
@@ -107,12 +109,6 @@
@TableField(exist = false)
private String addressPic;
@TableField(exist = false)
- private String province;
- @TableField(exist = false)
- private String city;
- @TableField(exist = false)
- private String township;
- @TableField(exist = false)
private String addressArea;
@TableField(exist = false)
private String detailAddress;
@@ -132,7 +128,16 @@
* 是否送货上门 1：是 2：否
*/
private Integer isHome;
+ /**
+ * 是否开过发票 0：未开 1：已开
+ */
+ private Integer isInvoice;
@TableField(exist = false)
private String orderIds;
+
+ @TableField(exist = false)
+ private String expressNo;
+
+ private Integer isFree;
}
--
Gitblit v1.9.1