xuhy
2025-08-27 cd7dd3a996f8dcaeb5d288b58bd3d27442dc542b
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/OrderGood.java
@@ -37,10 +37,6 @@
    @TableField("order_id")
    private Long orderId;
    @ApiModelProperty(value = "商品券优惠金额")
    @TableField("good_amount")
    private BigDecimal goodsCouponAmount;
    @ApiModelProperty(value = "购买商品的json快照")
    @TableField("good_json")
    private String goodJson;
@@ -60,54 +56,7 @@
    @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 String superiorType;
    @ApiModelProperty(value = "获取分佣金额上级类型(1=直推上级,2=直帮上级)")
    @TableField("superior_price_type")
    private String superiorPriceType;
    @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;
    @ApiModelProperty("购买类型(1=普通商品,2=秒杀商品)")
    @TableField("type")
    private Integer type;
@@ -115,10 +64,16 @@
    @ApiModelProperty(value = "现金支付(0=否,1=是)")
    @TableField("cash_payment")
    private Integer cashPayment;
    @ApiModelProperty(value = "现金支付金额")
    @TableField(exist = false)
    private BigDecimal cashPaymentValue;
    @ApiModelProperty(value = "积分支付(0=否,1=是)")
    @TableField("point_payment")
    private Integer pointPayment;
    @ApiModelProperty(value = "积分支付数量")
    @TableField(exist = false)
    private Integer pointPaymentValue;
    @ApiModelProperty(value = "基础售价")
    @TableField("selling_price")
@@ -128,4 +83,7 @@
    @TableField("integral")
    private Integer integral;
    @ApiModelProperty(value = "订单编号 导入使用")
    @TableField(exist = false)
    private String orderNumber;
}