From e93aad02d2dd2a6e624e81ea0adb3611a8fc43e5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 26 十二月 2024 17:16:19 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java | 43 ++++++++++++++++++++++++-------------------
1 files changed, 24 insertions(+), 19 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 62d0f17..a4d8e97 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")
@@ -49,6 +49,14 @@
@ApiModelProperty(value = "结束时间（HH:mm）")
@TableField("end_time")
private String endTime;
+
+ @ApiModelProperty(value = "封面图片")
+ @TableField("home_picture")
+ private String homePicture;
+
+ @ApiModelProperty(value = "详情图，多个逗号分隔")
+ @TableField("details_picture")
+ private String detailsPicture;
@ApiModelProperty(value = "店长姓名")
@TableField("shop_manager")
@@ -88,27 +96,27 @@
@ApiModelProperty(value = "门店积分总数")
@TableField("shop_all_point")
- private BigDecimal shopAllPoint;
+ private Integer shopAllPoint;
@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("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;
@ApiModelProperty(value = "门店分佣总金额")
@TableField("giveaway_all_money")
@@ -133,6 +141,10 @@
@ApiModelProperty(value = "已提现金额")
@TableField("withdraw_money")
private BigDecimal withdrawMoney;
+
+ @ApiModelProperty(value = "余额")
+ @TableField("balance")
+ private BigDecimal balance;
@ApiModelProperty(value = "门店订单总数")
@TableField("order_number")
@@ -146,14 +158,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
@@ -164,4 +168,5 @@
private LocalDateTime createTime;
+
}
--
Gitblit v1.7.1