From 2ed6444f45d227e2acc6de65c3e8b582440fb83a Mon Sep 17 00:00:00 2001 From: luofl <1442745593@qq.com> Date: 星期四, 06 三月 2025 09:20:40 +0800 Subject: [PATCH] 迭代版本:2.28 --- ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/OrderGood.java | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 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 6545aff..b0f3b64 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 = "添加时间") @@ -80,7 +79,7 @@ @ApiModelProperty(value = "获取分佣金额上级类型(1=直推上级,2=直帮上级)") @TableField("superior_price_type") - private Integer superiorPriceType; + private String superiorPriceType; @ApiModelProperty(value = "核销门店可获得服务费") @TableField("servuce_shop_charges") @@ -109,6 +108,24 @@ @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