From e68c33e84e7f85fe8504de9c105d8597b996a906 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 02 十二月 2024 18:05:08 +0800
Subject: [PATCH] 完成购物车支付业务逻辑
---
ruoyi-api/ruoyi-api-order/src/main/java/model/OrderGood.java | 48 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 46 insertions(+), 2 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 01c601d..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
@@ -31,11 +31,11 @@
@ApiModelProperty(value = "商品id")
@TableField("goods_id")
- private Long goodsId;
+ private Integer goodsId;
@ApiModelProperty(value = "订单id")
@TableField("order_id")
- private Integer orderId;
+ private Long orderId;
@ApiModelProperty(value = "商品券优惠金额")
@TableField("good_amount")
@@ -61,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