From 29c9ada64cee7adf3399e92ee3a62f2b9ed338ed Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 14 一月 2025 10:19:38 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/OrderGood.java | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/OrderGood.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/OrderGood.java
index 6379aa0..6059977 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/OrderGood.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/OrderGood.java
@@ -55,7 +55,6 @@
@ApiModelProperty(value = "删除标志（0=否，1=是）")
@TableField("del_flag")
- @TableLogic
private Integer delFlag;
@ApiModelProperty(value = "添加时间")
@@ -76,8 +75,12 @@
@ApiModelProperty(value = "获取返佣积分上级类型（1=直推上级，2=直帮上级）")
@TableField("superior_type")
- private Integer superiorType;
-
+ private String superiorType;
+
+ @ApiModelProperty(value = "获取分佣金额上级类型（1=直推上级，2=直帮上级）")
+ @TableField("superior_price_type")
+ private String superiorPriceType;
+
@ApiModelProperty(value = "核销门店可获得服务费")
@TableField("servuce_shop_charges")
private BigDecimal servuceShopCharges;
@@ -105,6 +108,25 @@
@ApiModelProperty(value = "绑定门店上级门店可获得返佣积分")
@TableField("bound_shop_superiors_points")
private Integer boundShopSuperiorsPoints;
+ @ApiModelProperty("购买类型（1=普通商品，2=秒杀商品）")
+ @TableField("type")
+ private Integer type;
+
+ @ApiModelProperty(value = "现金支付（0=否，1=是）")
+ @TableField("cash_payment")
+ private Integer cashPayment;
+
+ @ApiModelProperty(value = "积分支付（0=否，1=是）")
+ @TableField("point_payment")
+ private Integer pointPayment;
+
+ @ApiModelProperty(value = "基础售价")
+ @TableField("selling_price")
+ private BigDecimal sellingPrice;
+
+ @ApiModelProperty(value = "基础积分")
+ @TableField("integral")
+ private Integer integral;
}
--
Gitblit v1.7.1