From 3cb59ae9ddc31e62988e5c7feb6647b44f1c7cf8 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 17 一月 2025 17:50:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/OrderGood.java | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 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 0eb2ab8..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
@@ -108,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