From 3ddb84f9f118c67e0bab27b4332779b8af0dc266 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 27 十二月 2024 11:36:39 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java | 42 +++++++++++++++++++++---------------------
1 files changed, 21 insertions(+), 21 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 b44742a..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
@@ -38,9 +38,9 @@
@TableField("pid")
private Integer pid;
- @ApiModelProperty(value = "营业星期（1,2,3,4,5,6,7）")
+ @ApiModelProperty(value = "营业星期：1-周一到周日 2-周一周五 3-仅周末")
@TableField("business_date")
- private String businessDate;
+ private Integer businessDate;
@ApiModelProperty(value = "开始时间（HH:mm）")
@TableField("start_time")
@@ -96,27 +96,30 @@
@ApiModelProperty(value = "门店积分总数")
@TableField("shop_all_point")
- private BigDecimal shopAllPoint;
+ private Integer shopAllPoint;
- @ApiModelProperty(value = "门店业绩积分")
- @TableField("shop_point")
- private BigDecimal shopPoint;
+ @ApiModelProperty(value = "绑定下级门店分佣积分")
+ @TableField("lower_level_share_point")
+ private Integer lowerLevelSharePoint;
@ApiModelProperty(value = "门店返佣积分")
@TableField("share_point")
- private BigDecimal sharePoint;
+ private Integer sharePoint;
@ApiModelProperty(value = "门店服务积分")
@TableField("server_point")
- private BigDecimal serverPoint;
-
- @ApiModelProperty(value = "下级门店返佣积分")
- @TableField("lower_level_rebate_points")
- private BigDecimal lowerLevelRebatePoints;
+ private Integer serverPoint;
@ApiModelProperty(value = "门店已用积分")
@TableField("use_point")
- private BigDecimal usePoint;
+ 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")
@@ -154,14 +161,6 @@
@TableField("custom_order_number")
private Integer customOrderNumber;
- @ApiModelProperty(value = "总评分")
- @TableField("score")
- private Integer score;
-
- @ApiModelProperty(value = "评分数量")
- @TableField("score_number")
- private Integer scoreNumber;
-
@ApiModelProperty(value = "删除（0=否，1=是）")
@TableField("del_flag")
@TableLogic
@@ -172,4 +171,5 @@
private LocalDateTime createTime;
+
}
--
Gitblit v1.7.1