From cbf2486983b77a27af9968bbb362cb8d43789115 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 26 三月 2025 15:30:53 +0800
Subject: [PATCH] 修改统计bug和部分功能修改
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/ShopPoint.java | 48 +++++++++++++++++++++++++-----------------------
1 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/ShopPoint.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/ShopPoint.java
index 8082908..566124b 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/ShopPoint.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/ShopPoint.java
@@ -39,26 +39,33 @@
@ApiModelProperty(value = "门店id")
@TableField("shop_id")
private Integer shopId;
+ @ApiModelProperty(value = "门店名称")
+ @TableField(exist = false)
+ @Excel(name = "门店名称")
+ private String shopName;
+ @ApiModelProperty(value = "店长姓名")
+ @TableField(exist = false)
+ @Excel(name = "店长姓名")
+ private String shopLeaderName;
+ @ApiModelProperty(value = "联系电话")
+ @TableField(exist = false)
+ @Excel(name = "联系电话")
+ private String phone;
@ApiModelProperty(value = "变动类型（1=门店业绩，2=门店返佣，3=下级门店返佣）")
@TableField("type")
- @Excel(name = "变动类型", readConverterExp = "1=门店业绩,2=门店返佣,3=下级门店返佣")
+ @Excel(name = "变动类型", readConverterExp = "1=门店服务返佣,2=门店返佣,3=下级门店返佣")
private Integer type;
-
- @ApiModelProperty(value = "历史余额")
- @TableField("historical_point")
- private Integer historicalPoint;
-
- @ApiModelProperty(value = "变动金额")
- @TableField("variable_point")
- @Excel(name = "变动金额")
- private Integer variablePoint;
-
@ApiModelProperty(value = "变动时间")
@TableField("create_time")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "变动时间")
private LocalDateTime createTime;
+
+ @ApiModelProperty(value = "变动金额")
+ @TableField("variable_point")
+ @Excel(name = "变动金额")
+ private Integer variablePoint;
@ApiModelProperty(value = "变动用户id")
@TableField("create_user_id")
@@ -71,21 +78,16 @@
@ApiModelProperty(value = "订单号")
@TableField("order_num")
private String orderNum;
+
+ @ApiModelProperty(value = "变动方向（-1：减少，1：增加）")
+ @TableField("change_direction")
+ private Integer changeDirection;
- @ApiModelProperty(value = "门店名称")
- @TableField(exist = false)
- @Excel(name = "门店名称")
- private String shopName;
- @ApiModelProperty(value = "店长姓名")
- @TableField(exist = false)
- @Excel(name = "店长姓名")
- private String shopLeaderName;
- @ApiModelProperty(value = "联系电话")
- @TableField(exist = false)
- @Excel(name = "联系电话")
- private String phone;
+
+
+
@TableField(exist = false)
private List<Integer> shopIds;
--
Gitblit v1.7.1