From 9b51a95fa8bc9b3a86108c6900e17fc55f8db467 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 19 May 2025 17:02:07 +0800
Subject: [PATCH] refactor(vip): 优化积分和返佣计算逻辑
---
src/main/java/cc/mrbird/febs/mall/entity/MallOrderItem.java | 39 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 38 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..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,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,39 @@
private String skuName;
+ private String skuImage;
+
private Integer cnt;
private BigDecimal price;
+ //支付积分
+ private BigDecimal scoreAmount;
private BigDecimal amount;
+
+ private BigDecimal costPrice;
+
+ private Integer isNormal;
+
+ /**
+ * 是否结清
+ */
+ 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