From 810d81a44d78bc3e7c42c2f116cc9968ab04baef Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 07 二月 2025 15:57:28 +0800
Subject: [PATCH] 修改门店首页统计bug
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/ShopBalanceStatement.java | 52 +++++++++++++++++++++++++++++++---------------------
1 files changed, 31 insertions(+), 21 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/ShopBalanceStatement.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/ShopBalanceStatement.java
index 9a97e0a..7aac151 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/ShopBalanceStatement.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/ShopBalanceStatement.java
@@ -38,10 +38,21 @@
@ApiModelProperty(value = "门店id")
@TableField("shop_id")
private Integer shopId;
-
- @ApiModelProperty(value = "变动类型（1=门店分佣，2=下级门店分佣，3=门店服务费）")
+ @ApiModelProperty(value = "门店名称")
+ @TableField(exist = false)
+ @Excel(name = "门店名称")
+ private String shopName;
+ @ApiModelProperty(value = "店长名称")
+ @TableField(exist = false)
+ @Excel(name = "店长姓名")
+ private String shopManagerName;
+ @ApiModelProperty(value = "联系电话")
+ @TableField(exist = false)
+ @Excel(name = "联系电话")
+ private String phone;
+ @ApiModelProperty(value = "变动类型（1=绑定门店分佣,2=下级门店分佣,3=核销门店服务费，4=提现）")
@TableField("type")
- @Excel(name = "变更类型",readConverterExp = "1=门店分佣,2=下级门店分佣,3=门店服务费，4=关联用户分佣")
+ @Excel(name = "变更类型",readConverterExp = "1=绑定门店分佣,2=下级门店分佣,3=核销门店服务费,4=提现")
private Integer type;
@ApiModelProperty(value = "历史余额")
@@ -51,16 +62,20 @@
@ApiModelProperty(value = "变动金额")
@TableField("variable_amount")
private BigDecimal variableAmount;
-
- @ApiModelProperty(value = "变动后余额")
- @TableField("balance")
- @Excel(name = "变更后数量")
- private BigDecimal balance;
-
@ApiModelProperty(value = "变动时间")
@TableField("create_time")
@Excel(name = "变更时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
+ @ApiModelProperty(value = "变动金额")
+ @TableField(exist = false)
+ @Excel(name = "变更数量")
+ private String variableAmountString;
+
+ @ApiModelProperty(value = "变动后余额")
+ @TableField("balance")
+ private BigDecimal balance;
+
+
@ApiModelProperty(value = "变动用户id")
@TableField("create_user_id")
@@ -70,20 +85,11 @@
@TableField("object_id")
private Long objectId;
- @ApiModelProperty(value = "门店名称")
- @TableField(exist = false)
- @Excel(name = "门店名称")
- private String shopName;
- @ApiModelProperty(value = "店长名称")
- @TableField(exist = false)
- @Excel(name = "店长名称")
- private String shopManagerName;
- @ApiModelProperty(value = "联系电话")
- @TableField(exist = false)
- @Excel(name = "联系电话")
- private String phone;
+
+
+
@ApiModelProperty(value = "开始时间")
@TableField(exist = false)
@@ -96,4 +102,8 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private String endTime;
+
+ @ApiModelProperty(value = "扩展字段")
+ @TableField("extension")
+ private String extension;
}
--
Gitblit v1.7.1