From a323bb6fbfdd9fa7bc03465b7fbed2baf6d0fa84 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 27 十二月 2024 09:34:47 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java
index 37a518d..3a5830a 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java
@@ -98,9 +98,9 @@
@TableField("shop_all_point")
private Integer shopAllPoint;
- @ApiModelProperty(value = "门店业绩积分")
- @TableField("shop_point")
- private Integer shopPoint;
+ @ApiModelProperty(value = "绑定下级门店分佣积分")
+ @TableField("lower_level_share_point")
+ private Integer lowerLevelSharePoint;
@ApiModelProperty(value = "门店返佣积分")
@TableField("share_point")
@@ -110,13 +110,16 @@
@TableField("server_point")
private Integer serverPoint;
- @ApiModelProperty(value = "下级门店返佣积分")
- @TableField("lower_level_rebate_points")
- private Integer lowerLevelRebatePoints;
-
@ApiModelProperty(value = "门店已用积分")
@TableField("use_point")
private Integer usePoint;
+
+ @ApiModelProperty(value = "门店剩余积分")
+ @TableField("lave_point")
+ private Integer lavePoint;
+
+ @TableField(exist = false)
+ private Integer laveUsePoint;
@ApiModelProperty(value = "门店分佣总金额")
@TableField("giveaway_all_money")
@@ -141,6 +144,10 @@
@ApiModelProperty(value = "已提现金额")
@TableField("withdraw_money")
private BigDecimal withdrawMoney;
+
+ @ApiModelProperty(value = "余额")
+ @TableField("balance")
+ private BigDecimal balance;
@ApiModelProperty(value = "门店订单总数")
@TableField("order_number")
--
Gitblit v1.7.1