From 0c980680e46ae0630e565d2c4dcced8b8737842a Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 16 一月 2025 15:50:29 +0800
Subject: [PATCH] 12.18

---
 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/ShopPoint.java |   67 +++++++++++++++++++++++++++++++--
 1 files changed, 62 insertions(+), 5 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 86ada89..34e632c 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
@@ -3,14 +3,18 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -35,22 +39,43 @@
     @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=下级门店返佣")
     private Integer type;
+    @ApiModelProperty(value = "变动时间")
+    @TableField("create_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "变动时间")
+    private LocalDateTime createTime;
 
     @ApiModelProperty(value = "历史余额")
     @TableField("historical_point")
-    private BigDecimal historicalPoint;
+    private Integer historicalPoint;
 
     @ApiModelProperty(value = "变动金额")
     @TableField("variable_point")
-    private BigDecimal variablePoint;
+    @Excel(name = "变动金额")
+    private Integer variablePoint;
+    
+    @ApiModelProperty(value = "变动后余额")
+    @TableField("balance")
+    private Integer balance;
 
-    @ApiModelProperty(value = "变动时间")
-    @TableField("create_time")
-    private LocalDateTime createTime;
+
 
     @ApiModelProperty(value = "变动用户id")
     @TableField("create_user_id")
@@ -60,5 +85,37 @@
     @TableField("object_id")
     private Long objectId;
 
+    @ApiModelProperty(value = "订单号")
+    @TableField("order_num")
+    private String orderNum;
+
+
+
+
+
+
+
+    @TableField(exist = false)
+    private List<Integer> shopIds;
+
+    @ApiModelProperty(value = "开始时间")
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime startTime;
+
+    @ApiModelProperty(value = "结束时间")
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime endTime;
+
+    @TableField(exist = false)
+    private List<Long> userIds;
+    @TableField(exist = false)
+    private Integer pageNum;
+    @TableField(exist = false)
+    private Integer pageSize;
+
 
 }

--
Gitblit v1.7.1