Compare commits

..

2 Commits

Author SHA1 Message Date
2ed121926b feat(tenant-balance): 新增可提现金额字段 2025-12-29 20:00:18 +08:00
c07367ea53 refactor(user-invite-codes): 重命名字段并调整顺序
将 systemUserId 重命名为 ownerSystemUserId,并统一调整字段顺序与注释,保持 DO/VO/Mapper 一致性。
2025-12-29 18:55:03 +08:00
9 changed files with 11 additions and 17 deletions

View File

@@ -27,4 +27,7 @@ public class TenantBalancePageReqVO extends PageParam {
@Schema(description = "冻结金额") @Schema(description = "冻结金额")
private BigDecimal frozenAmt; private BigDecimal frozenAmt;
@Schema(description = "可提现金额")
private BigDecimal withdrawableBalance;
} }

View File

@@ -32,4 +32,7 @@ public class TenantBalanceRespVO {
@Schema(description = "冻结金额") @Schema(description = "冻结金额")
private BigDecimal frozenAmt; private BigDecimal frozenAmt;
@Schema(description = "可提现金额")
private BigDecimal withdrawableBalance;
} }

View File

@@ -31,4 +31,6 @@ public class TenantBalanceSaveReqVO {
@Schema(description = "冻结金额") @Schema(description = "冻结金额")
private BigDecimal frozenAmt; private BigDecimal frozenAmt;
@Schema(description = "可提现金额")
private BigDecimal withdrawableBalance;
} }

View File

@@ -34,9 +34,6 @@ public class KeyboardUserInviteCodesPageReqVO extends PageParam {
@Schema(description = "邀请码已使用次数", example = "25037") @Schema(description = "邀请码已使用次数", example = "25037")
private Integer usedCount; private Integer usedCount;
@Schema(description = "邀请码所属系统用户ID邀请人", example = "20047")
private Long systemUserId;
@Schema(description = "邀请码所属租户", example = "17355") @Schema(description = "邀请码所属租户", example = "17355")
private Long ownerTenantId; private Long ownerTenantId;

View File

@@ -43,16 +43,12 @@ public class KeyboardUserInviteCodesRespVO {
@Schema(description = "邀请码已使用次数", requiredMode = Schema.RequiredMode.REQUIRED, example = "25037") @Schema(description = "邀请码已使用次数", requiredMode = Schema.RequiredMode.REQUIRED, example = "25037")
@ExcelProperty("邀请码已使用次数") @ExcelProperty("邀请码已使用次数")
private Integer usedCount; private Integer usedCount;
@Schema(description = "邀请码所属系统用户ID邀请人", example = "20047")
@ExcelProperty("邀请码所属系统用户ID邀请人")
private Long systemUserId;
@Schema(description = "邀请码所属租户", example = "17355") @Schema(description = "邀请码所属租户", example = "17355")
@ExcelProperty("邀请码所属租户") @ExcelProperty("邀请码所属租户")
private Long ownerTenantId; private Long ownerTenantId;
@Schema(description = "邀请码所属系统用户", example = "772") @Schema(description = "邀请码所属系统用户ID邀请人", example = "772")
@ExcelProperty("邀请码所属系统用户") @ExcelProperty("邀请码所属系统用户")
private Long ownerSystemUserId; private Long ownerSystemUserId;

View File

@@ -40,9 +40,6 @@ public class KeyboardUserInviteCodesSaveReqVO {
@NotNull(message = "邀请码已使用次数不能为空") @NotNull(message = "邀请码已使用次数不能为空")
private Integer usedCount; private Integer usedCount;
@Schema(description = "邀请码所属系统用户ID邀请人", example = "20047")
private Long systemUserId;
@Schema(description = "邀请码所属租户", example = "17355") @Schema(description = "邀请码所属租户", example = "17355")
private Long ownerTenantId; private Long ownerTenantId;

View File

@@ -49,4 +49,5 @@ public class TenantBalanceDO extends BaseDO {
*/ */
private BigDecimal frozenAmt; private BigDecimal frozenAmt;
private BigDecimal withdrawableBalance;
} }

View File

@@ -56,10 +56,6 @@ public class KeyboardUserInviteCodesDO {
* 邀请码已使用次数 * 邀请码已使用次数
*/ */
private Integer usedCount; private Integer usedCount;
/**
* 邀请码所属系统用户ID邀请人
*/
private Long systemUserId;
/** /**
* 邀请码所属租户 * 邀请码所属租户
*/ */

View File

@@ -26,7 +26,6 @@ public interface KeyboardUserInviteCodesMapper extends BaseMapperX<KeyboardUserI
.eqIfPresent(KeyboardUserInviteCodesDO::getExpiresAt, reqVO.getExpiresAt()) .eqIfPresent(KeyboardUserInviteCodesDO::getExpiresAt, reqVO.getExpiresAt())
.eqIfPresent(KeyboardUserInviteCodesDO::getMaxUses, reqVO.getMaxUses()) .eqIfPresent(KeyboardUserInviteCodesDO::getMaxUses, reqVO.getMaxUses())
.eqIfPresent(KeyboardUserInviteCodesDO::getUsedCount, reqVO.getUsedCount()) .eqIfPresent(KeyboardUserInviteCodesDO::getUsedCount, reqVO.getUsedCount())
.eqIfPresent(KeyboardUserInviteCodesDO::getSystemUserId, reqVO.getSystemUserId())
.eqIfPresent(KeyboardUserInviteCodesDO::getOwnerTenantId, reqVO.getOwnerTenantId()) .eqIfPresent(KeyboardUserInviteCodesDO::getOwnerTenantId, reqVO.getOwnerTenantId())
.eqIfPresent(KeyboardUserInviteCodesDO::getOwnerSystemUserId, reqVO.getOwnerSystemUserId()) .eqIfPresent(KeyboardUserInviteCodesDO::getOwnerSystemUserId, reqVO.getOwnerSystemUserId())
.eqIfPresent(KeyboardUserInviteCodesDO::getInviteType, reqVO.getInviteType()) .eqIfPresent(KeyboardUserInviteCodesDO::getInviteType, reqVO.getInviteType())