diff --git a/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/entity/SmUser.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/entity/SmUser.java index 8187661f..e5f30610 100644 --- a/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/entity/SmUser.java +++ b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/entity/SmUser.java @@ -127,19 +127,23 @@ public class SmUser extends BaseEntity private Boolean isMch; @ApiModelProperty("服务费费率") + @JsonView(JsonViewProfile.App.class) private BigDecimal serviceRate; @ApiModelProperty("是否设备管理员") private Boolean deviceAdmin; @ApiModelProperty("服务费收取方式") + @JsonView(JsonViewProfile.App.class) private String serviceType; @Excel(name = "提现服务费收取类型:1-百分比抽成,2-每笔提现收取") @ApiModelProperty("提现服务费收取类型:1-百分比抽成,2-每笔提现收取") + @JsonView(JsonViewProfile.App.class) private String withdrawServiceType; @Excel(name = "提现服务费费") @ApiModelProperty("提现服务费费") + @JsonView(JsonViewProfile.App.class) private BigDecimal withdrawServiceRate; } diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/user/domain/SmUserVo.java b/smart-switch-service/src/main/java/com/ruoyi/ss/user/domain/SmUserVo.java index fc5dbc00..1804ae4e 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/user/domain/SmUserVo.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/user/domain/SmUserVo.java @@ -24,6 +24,7 @@ public class SmUserVo extends SmUser { @Excel(name = "充值金额") @ApiModelProperty("充值金额") + @JsonView(JsonViewProfile.App.class) private BigDecimal rechargeAmount; // 充值金额 @Excel(name = "提现金额") @@ -32,6 +33,7 @@ public class SmUserVo extends SmUser { private BigDecimal withDrawlAmount; // 提现金额 @ApiModelProperty("总收入") + @JsonView(JsonViewProfile.App.class) private BigDecimal totalIncome; // 总收入 @ApiModelProperty("商户店铺数量")