From d51a8cfa10c34d9c1e7d6b4726d31e75ecee5dc6 Mon Sep 17 00:00:00 2001 From: phpcjl <phpcjl@gmail.com> Date: 星期五, 20 十二月 2024 18:32:03 +0800 Subject: [PATCH] 1 --- ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsArea.java | 113 ++++++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 92 insertions(+), 21 deletions(-) diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsArea.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsArea.java index 62f760e..7e97c84 100644 --- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsArea.java +++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsArea.java @@ -1,5 +1,7 @@ package com.ruoyi.other.api.domain; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; @@ -9,61 +11,130 @@ import java.io.Serializable; import java.math.BigDecimal; +import java.util.List; +/** + * <p> + * + * </p> + * + * @author luodangjia + * @since 2024-11-20 + */ @Data @EqualsAndHashCode(callSuper = false) @TableName("t_goods_area") -@ApiModel(value = "GoodsArea对象", description = "") +@ApiModel(value="商品地区价格对象", description="") public class GoodsArea implements Serializable { + private static final long serialVersionUID = 1L; @ApiModelProperty(value = "主键") - @TableId + @TableId(value = "id", type = IdType.NONE) private Long id; + @ApiModelProperty(value = "商品id") - private Long goodsPd; + @TableField("goods_id") + private Integer goodsId; + @ApiModelProperty(value = "省") + @TableField("province") private String province; + @ApiModelProperty(value = "省编号") - private String provincePode; + @TableField("province_code") + private String provinceCode; + @ApiModelProperty(value = "市") + @TableField("city") private String city; + @ApiModelProperty(value = "市编号") - private String cityPode; + @TableField("city_code") + private String cityCode; + @ApiModelProperty(value = "区") + @TableField("districts") private String districts; + @ApiModelProperty(value = "区编号") - private String districtsPode; + @TableField("districts_code") + private String districtsCode; + @ApiModelProperty(value = "会员级别(1=普通会员,2=黄金会员,3=钻石会员,4=准代理,5=代理,6=总代,7=合伙人)") - private Long vip; + @TableField("vip") + private Integer vip; + @ApiModelProperty(value = "现金支付(0=否,1=是)") - private Long cashPayment; + @TableField("cash_payment") + private Integer cashPayment; + @ApiModelProperty(value = "积分支付(0=否,1=是)") - private Long pointPayment; + @TableField("point_payment") + private Integer pointPayment; + @ApiModelProperty(value = "基础售价") + @TableField("selling_price") private BigDecimal sellingPrice; + @ApiModelProperty(value = "基础积分") - private Long integral; + @TableField("integral") + private Integer integral; + @ApiModelProperty(value = "可获得消费积分") - private Long earnPpendingPoints; + @TableField("earn_spending_points") + private Integer earnSpendingPoints; + @ApiModelProperty(value = "上级获得分佣金额") - private BigDecimal superiorPubcommission; + @TableField("superior_subcommission") + private BigDecimal superiorSubcommission; + @ApiModelProperty(value = "上级获得返佣积分") - private Long superiorPebatePoints; + @TableField("superior_rebate_points") + private Integer superiorRebatePoints; + @ApiModelProperty(value = "获取返佣积分上级类型(1=直推上级,2=直帮上级)") - private Long superiorPype; + @TableField("superior_type") + private String superiorType; + + @ApiModelProperty(value = "获取分佣金额上级类型(1=直推上级,2=直帮上级)") + @TableField("superior_price_type") + private String superiorPriceType; + @ApiModelProperty(value = "核销门店可获得服务费") - private BigDecimal servucePhopPharges; + @TableField("servuce_shop_charges") + private BigDecimal servuceShopCharges; + @ApiModelProperty(value = "核销门店可获得服务积分") - private Long servucePhopPoints; + @TableField("servuce_shop_points") + private Integer servuceShopPoints; + @ApiModelProperty(value = "技师可获得服务积分") - private Long technicianPoints; + @TableField("technician_points") + private Integer technicianPoints; + @ApiModelProperty(value = "绑定门店可获得分佣金额") - private BigDecimal boundPhopPharges; + @TableField("bound_shop_charges") + private BigDecimal boundShopCharges; + @ApiModelProperty(value = "绑定门店可获得返佣积分") - private Long boundPhopPoints; + @TableField("bound_shop_points") + private Integer boundShopPoints; + @ApiModelProperty(value = "绑定门店上级门店可获得分佣金额") - private BigDecimal boundPhopPuperiorsPharges; + @TableField("bound_shop_superiors_charges") + private BigDecimal boundShopSuperiorsCharges; + @ApiModelProperty(value = "绑定门店上级门店可获得返佣积分") - private Long boundPhopPuperiorsPoints; + @TableField("bound_shop_superiors_points") + private Integer boundShopSuperiorsPoints; + + @ApiModelProperty(value = "vip名子") + @TableField(exist = false) + private String vipName; + + @TableField(exist = false) + private List<GoodsArea> goodsAreaList; + + } -- Gitblit v1.7.1