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/MallOrderItem.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallOrderItem.java b/src/main/java/cc/mrbird/febs/mall/entity/MallOrderItem.java
index 8fecef8..c5454f1 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallOrderItem.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallOrderItem.java
@@ -3,6 +3,7 @@
import cc.mrbird.febs.common.entity.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
@@ -19,6 +20,8 @@
private Long skuId;
+ private String memberInviteId;
+
private Long memberCouponId;
private Long goodsId;
@@ -34,12 +37,19 @@
private Integer cnt;
private BigDecimal price;
+ //支付积分
+ private BigDecimal scoreAmount;
private BigDecimal amount;
private BigDecimal costPrice;
+ //一级佣金
+ private BigDecimal levelOnePrice;
private Integer isNormal;
+
+ //商品状态 0-待自提 1-已自提
+ private Integer leaderState;
/**
* 是否结清
@@ -50,4 +60,16 @@
@TableField(exist = false)
private long[] orderIdsStr;
+
+ @TableField(exist = false)
+ private String unit;
+
+ @TableField(exist = false)
+ private BigDecimal itemAmount;
+
+ @TableField(exist = false)
+ private BigDecimal itemScoreAmount;
+
+ @TableField(exist = false)
+ private BigDecimal itemScorePrice;
}
--
Gitblit v1.9.1