From b8abd1c4081c2c67c1f258b9956f4c60652d831d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 27 八月 2025 17:13:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java
index 2babef7..303c4a2 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java
@@ -87,23 +87,27 @@
private LocalDateTime lastLoginTime;
- @ApiModelProperty(value = "绑定门店id")
+ @ApiModelProperty(value = "门店id")
@TableField("shop_id")
private Integer shopId;
- @ApiModelProperty(value = "绑定门店名称")
+ @ApiModelProperty(value = "门店名称")
@TableField(exist = false)
private String shopName;
- @ApiModelProperty(value = "绑定门店列表")
+ @ApiModelProperty(value = "门店列表")
@TableField(exist = false)
private List<String> shopNames;
- @ApiModelProperty(value = "绑定门店封面")
+ @ApiModelProperty(value = "门店封面")
@TableField(exist = false)
private String shopCover;
- @ApiModelProperty(value = "绑定门店地址")
+ @ApiModelProperty(value = "门店地址")
@TableField(exist = false)
private String shopAddress;
- @ApiModelProperty(value = "消费总金额")
+ @ApiModelProperty(value = "门店状态（0-未拥有门店，1-正常，2-冻结）")
+ @TableField(exist = false)
+ private Integer shopStatus;
+
+ @ApiModelProperty(value = "消费总金额（微信支付总金额）")
@TableField("shop_amount")
private BigDecimal shopAmount;
@@ -121,7 +125,7 @@
@ApiModelProperty(value = "充值积分")
@TableField("recharge_point")
- private BigDecimal rechargePoint;
+ private Integer rechargePoint;
@ApiModelProperty(value = "取消订单积分")
@@ -177,7 +181,9 @@
private String qrCode;
-
+ @ApiModelProperty("消费绿电分数")
+ @TableField(exist = false)
+ private Integer customPoint;
@ApiModelProperty("绑定门店id列表")
@TableField(exist = false)
@@ -193,20 +199,14 @@
@TableField(exist = false)
private Set<Long> userIds;
- @TableField(exist = false)
- private Integer excludeStatus;
+
public String getIdStr(){
return String.valueOf(id);
}
- public Integer getUserTotalPoint(){
- if (totalPoint == null){
- totalPoint = 0;
- }
- return totalPoint ;
- }
+
--
Gitblit v1.7.1