From a981c07d34edd0975b9d556d97c1f851ce79974c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 04 十二月 2024 13:40:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/model/OrderGood.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 58 insertions(+), 1 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/model/OrderGood.java b/ruoyi-api/ruoyi-api-order/src/main/java/model/OrderGood.java
index 4bb6975..cc8495c 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/model/OrderGood.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/model/OrderGood.java
@@ -7,6 +7,7 @@
import lombok.EqualsAndHashCode;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
@@ -28,13 +29,25 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
+ @ApiModelProperty(value = "商品id")
+ @TableField("goods_id")
+ private Integer goodsId;
+
@ApiModelProperty(value = "订单id")
@TableField("order_id")
- private Integer orderId;
+ private Long orderId;
+
+ @ApiModelProperty(value = "商品券优惠金额")
+ @TableField("good_amount")
+ private BigDecimal goodsCouponAmount;
@ApiModelProperty(value = "购买商品的json快照")
@TableField("good_json")
private String goodJson;
+
+ @ApiModelProperty(value = "秒杀活动json快照")
+ @TableField("seckill_json")
+ private String seckillJson;
@ApiModelProperty(value = "数量")
@TableField("num")
@@ -48,6 +61,50 @@
@ApiModelProperty(value = "添加时间")
@TableField("create_time")
private LocalDateTime createTime;
+
+ @ApiModelProperty(value = "可获得消费积分")
+ @TableField("earn_spending_points")
+ private Integer earnSpendingPoints;
+
+ @ApiModelProperty(value = "上级获得分佣金额")
+ @TableField("superior_subcommission")
+ private BigDecimal superiorSubcommission;
+
+ @ApiModelProperty(value = "上级获得返佣积分")
+ @TableField("superior_rebate_points")
+ private Integer superiorRebatePoints;
+
+ @ApiModelProperty(value = "获取返佣积分上级类型（1=直推上级，2=直帮上级）")
+ @TableField("superior_type")
+ private Integer superiorType;
+
+ @ApiModelProperty(value = "核销门店可获得服务费")
+ @TableField("servuce_shop_charges")
+ private BigDecimal servuceShopCharges;
+
+ @ApiModelProperty(value = "核销门店可获得服务积分")
+ @TableField("servuce_shop_points")
+ private Integer servuceShopPoints;
+
+ @ApiModelProperty(value = "技师可获得服务积分")
+ @TableField("technician_points")
+ private Integer technicianPoints;
+
+ @ApiModelProperty(value = "绑定门店可获得分佣金额")
+ @TableField("bound_shop_charges")
+ private BigDecimal boundShopCharges;
+
+ @ApiModelProperty(value = "绑定门店可获得返佣积分")
+ @TableField("bound_shop_points")
+ private Integer boundShopPoints;
+
+ @ApiModelProperty(value = "绑定门店上级门店可获得分佣金额")
+ @TableField("bound_shop_superiors_charges")
+ private BigDecimal boundShopSuperiorsCharges;
+
+ @ApiModelProperty(value = "绑定门店上级门店可获得返佣积分")
+ @TableField("bound_shop_superiors_points")
+ private Integer boundShopSuperiorsPoints;
}
--
Gitblit v1.7.1