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 | 44 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 43 insertions(+), 1 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 6cf10f1..c5454f1 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallOrderItem.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallOrderItem.java
@@ -1,6 +1,9 @@
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 io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
@@ -11,11 +14,15 @@
**/
@Data
@TableName("mall_order_item")
-public class MallOrderItem {
+public class MallOrderItem extends BaseEntity {
private Long orderId;
private Long skuId;
+
+ private String memberInviteId;
+
+ private Long memberCouponId;
private Long goodsId;
@@ -25,9 +32,44 @@
private String skuName;
+ private String skuImage;
+
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;
+
+ /**
+ * 是否结清
+ */
+ private Integer hasSettle;
+ //1:正常 2：退款中3：已退
+ private Integer state;
+
+ @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