From 6b3a3251bc06b081903dfe94134f034608c18ba4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 18 十二月 2024 16:03:01 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/ShopBalanceStatement.java | 37 ++++++++++++++++++++++++++++++++++++-
1 files changed, 36 insertions(+), 1 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 2e8da40..377b1c6 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
@@ -3,10 +3,13 @@
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;
@@ -36,8 +39,9 @@
@TableField("shop_id")
private Integer shopId;
- @ApiModelProperty(value = "变动类型（1=返佣，2=提现）")
+ @ApiModelProperty(value = "变动类型（1=门店分佣，2=下级门店分佣，3=门店服务费）")
@TableField("type")
+ @Excel(name = "变更类型",readConverterExp = "1=门店分佣,2=下级门店分佣,3=门店服务费")
private Integer type;
@ApiModelProperty(value = "历史余额")
@@ -48,8 +52,14 @@
@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 = "变动用户id")
@@ -60,5 +70,30 @@
@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)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private String startTime;
+
+ @ApiModelProperty(value = "结束时间")
+ @TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private String endTime;
}
--
Gitblit v1.7.1