From acccff9860b271d55c55dc87486f7c20b9896e6c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 13 一月 2025 16:19:54 +0800
Subject: [PATCH] 修改bug
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/ShopPoint.java | 71 +++++++++++++++++++++--------------
1 files changed, 42 insertions(+), 29 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 cf885bf..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
@@ -39,34 +39,6 @@
@ApiModelProperty(value = "门店id")
@TableField("shop_id")
private Integer shopId;
-
- @ApiModelProperty(value = "变动类型（1=门店业绩，2=门店返佣，3=下级门店返佣）")
- @TableField("type")
- @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")
- @Excel(name = "变动时间")
- private LocalDateTime createTime;
-
- @ApiModelProperty(value = "变动用户id")
- @TableField("create_user_id")
- private Long createUserId;
-
- @ApiModelProperty(value = "关联对象id")
- @TableField("object_id")
- private Long objectId;
-
@ApiModelProperty(value = "门店名称")
@TableField(exist = false)
@Excel(name = "门店名称")
@@ -76,11 +48,52 @@
@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 Integer historicalPoint;
+
+ @ApiModelProperty(value = "变动金额")
+ @TableField("variable_point")
+ @Excel(name = "变动金额")
+ private Integer variablePoint;
+
+ @ApiModelProperty(value = "变动后余额")
+ @TableField("balance")
+ private Integer balance;
+
+
+
+ @ApiModelProperty(value = "变动用户id")
+ @TableField("create_user_id")
+ private Long createUserId;
+
+ @ApiModelProperty(value = "关联对象id")
+ @TableField("object_id")
+ private Long objectId;
+
+ @ApiModelProperty(value = "订单号")
+ @TableField("order_num")
+ private String orderNum;
+
+
+
+
+
+
@TableField(exist = false)
private List<Integer> shopIds;
--
Gitblit v1.7.1