From 6e39306a7fc83890659f098ed9c6c5f686a6371b Mon Sep 17 00:00:00 2001 From: Administrator <15274802129@163.com> Date: Tue, 20 May 2025 11:54:08 +0800 Subject: [PATCH] feat(mall): 优化新人礼领取逻辑并添加领取状态字段- 优化新人礼领取逻辑,检查优惠券是否存在且状态为有效 - 在 MallMemberVo 中添加 newGift 字段,用于表示是否领取新人礼 --- src/main/java/cc/mrbird/febs/mall/entity/MallOrderItem.java | 23 +++++++++++++++++++++++ 1 files changed, 23 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 a273b60..bf0c877 100644 --- a/src/main/java/cc/mrbird/febs/mall/entity/MallOrderItem.java +++ b/src/main/java/cc/mrbird/febs/mall/entity/MallOrderItem.java @@ -1,7 +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; @@ -18,6 +20,10 @@ private Long skuId; + private String memberInviteId; + + private Long memberCouponId; + private Long goodsId; private String goodsName; @@ -31,6 +37,8 @@ private Integer cnt; private BigDecimal price; + //支付积分 + private BigDecimal scoreAmount; private BigDecimal amount; @@ -44,4 +52,19 @@ 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