From ea8e4abfb8c81cdae4d2a8743d81b615000f352d Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Fri, 23 May 2025 16:57:23 +0800
Subject: [PATCH] feat(order): 添加自提点订单确认功能
---
src/main/java/cc/mrbird/febs/mall/entity/MallOrderItem.java | 37 +++++++++++++++++++++++++++++++++++++
1 files changed, 37 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 2fa493f..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,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,8 +37,39 @@
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