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-account/src/main/java/com/ruoyi/account/api/model/AppUser.java | 72 ++++++++++++++++++++++++++++++------ 1 files changed, 60 insertions(+), 12 deletions(-) diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java index cda2ba0..078ec05 100644 --- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java +++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java @@ -77,6 +77,10 @@ @ApiModelProperty(value = "最后一次登录时间") @TableField("last_login_time") private LocalDateTime lastLoginTime; + + @ApiModelProperty(value = "顶级推广人id") + @TableField("top_invite_id") + private Long topInviteId; @ApiModelProperty(value = "推广人id") @TableField("invite_user_id") @@ -85,9 +89,7 @@ @TableField(exist = false) private String inviteUserName; - @ApiModelProperty(value = "当前用户顶级的推广人id") - @TableField("top_invite_id") - private Long topInviteId; + @ApiModelProperty(value = "绑定门店id") @TableField("shop_id") @@ -98,19 +100,19 @@ @ApiModelProperty(value = "合伙人积分数") @TableField("part_point") - private BigDecimal partPoint; + private Integer partPoint; @ApiModelProperty(value = "合伙人培育积分数") @TableField("part_grow_point") - private BigDecimal partGrowPoint; + private Integer partGrowPoint; @ApiModelProperty(value = "消费积分数") @TableField("shop_point") - private BigDecimal shopPoint; + private Integer shopPoint; @ApiModelProperty(value = "返佣积分数") @TableField("share_point") - private BigDecimal sharePoint; + private Integer sharePoint; @ApiModelProperty(value = "消费总金额") @TableField("shop_amount") @@ -122,23 +124,67 @@ @ApiModelProperty(value = "可提现金额") @TableField("withdrawable_amount") - private BigDecimal withdrawal_amount; + private BigDecimal withdrawableAmount; @ApiModelProperty(value = "已提现金额") @TableField("withdrawn_amount") - private BigDecimal withdrawn_amount; + private BigDecimal withdrawnAmount; @ApiModelProperty(value = "充值总金额") @TableField("total_recharge_amount") - private BigDecimal total_recharge_amount; + private BigDecimal totalRechargeAmount; @ApiModelProperty(value = "红包总金额") @TableField("total_red_packet_amount") - private BigDecimal total_red_packet_amount; + private BigDecimal totalRedPacketAmount; @ApiModelProperty(value = "分销总金额") @TableField("total_distribution_amount") - private BigDecimal total_distribution_amount; + private BigDecimal totalDistributionAmount; + + @ApiModelProperty(value = "账户余额") + @TableField("balance") + private BigDecimal balance; + + @ApiModelProperty(value = "剩余积分") + @TableField("lave_point") + private Integer lavePoint; + + @ApiModelProperty(value = "是否可更换推广人(0=否,1=是)") + @TableField("change_promoter") + private Integer changePromoter; + + @ApiModelProperty(value = "经度") + @TableField("longitude") + private String longitude; + + @ApiModelProperty(value = "纬度") + @TableField("latitude") + private String latitude; + + @ApiModelProperty(value = "省") + @TableField("province") + private String province; + + @ApiModelProperty(value = "省编号") + @TableField("province_code") + private String provinceCode; + + @ApiModelProperty(value = "市") + @TableField("city") + private String city; + + @ApiModelProperty(value = "市编号") + @TableField("city_code") + private String cityCode; + + @ApiModelProperty(value = "区") + @TableField("district") + private String district; + + @ApiModelProperty(value = "区编号") + @TableField("district_code") + private String districtCode; @ApiModelProperty("等级1会员数") private Long count1; @@ -161,4 +207,6 @@ @ApiModelProperty("等级7会员数") private Long count7; + + } -- Gitblit v1.7.1