diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/Apps.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/Apps.java index 7a606a0..fb35811 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/Apps.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/Apps.java @@ -1,18 +1,18 @@ package com.ruoyi.system.domain; +import java.math.BigDecimal; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonProperty; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; import java.io.Serializable; /** - * 应用管理对象 apps + * 平台商户对象 apps * * @author luqj - * @date 2025-11-25 + * @date 2026-10-08 */ public class Apps extends BaseEntity { @@ -21,13 +21,12 @@ public class Apps extends BaseEntity /** 主键 */ private Long id; - /** 用户 */ - @Excel(name = "用户") + /** 用户ID */ + @Excel(name = "用户ID") private Long userId; - @Excel(name = "归集地址") - private String distTokenAddress; - /** 名称 */ - @Excel(name = "名称") + + /** 商户名称 */ + @Excel(name = "商户名称") private String name; /** 描述 */ @@ -49,8 +48,46 @@ public class Apps extends BaseEntity private Date updatedAt; /** 删除时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "删除时间", width = 30, dateFormat = "yyyy-MM-dd") private Date deletedAt; + /** trx账号 */ + @Excel(name = "trx账号金额") + private BigDecimal trxBalance; + + /** usdt账号 */ + @Excel(name = "usdt账号金额") + private BigDecimal usdtBalance; + + /** 公钥 */ + @Excel(name = "公钥") + private String publicKey; + + /** 信用额度 */ + @Excel(name = "信用额度金额") + private BigDecimal creditLimit; + + /** Google OpenID Connect subject ID */ + @Excel(name = "Google OpenID Connect subject ID") + private String googleSub; + + /** Google账号邮箱 */ + @Excel(name = "Google账号邮箱") + private String googleEmail; + + /** Google账号名称 */ + @Excel(name = "Google账号名称") + private String googleName; + + /** Google头像URL */ + @Excel(name = "Google头像URL") + private String googlePicture; + + /** 归集地址 */ + @Excel(name = "归集地址") + private String distTokenAddress; + public void setId(Long id) { this.id = id; @@ -87,20 +124,12 @@ public class Apps extends BaseEntity { return description; } - public void setStatus(Integer status) + public void setStatus(Integer status) { this.status = status; } - public String getDistTokenAddress() { - return distTokenAddress; - } - - public void setDistTokenAddress(String distTokenAddress) { - this.distTokenAddress = distTokenAddress; - } - - public Integer getStatus() + public Integer getStatus() { return status; } @@ -131,6 +160,87 @@ public class Apps extends BaseEntity { return deletedAt; } + public void setTrxBalance(BigDecimal trxBalance) + { + this.trxBalance = trxBalance; + } + + public BigDecimal getTrxBalance() + { + return trxBalance; + } + public void setUsdtBalance(BigDecimal usdtBalance) + { + this.usdtBalance = usdtBalance; + } + + public BigDecimal getUsdtBalance() + { + return usdtBalance; + } + public void setPublicKey(String publicKey) + { + this.publicKey = publicKey; + } + + public String getPublicKey() + { + return publicKey; + } + public void setCreditLimit(BigDecimal creditLimit) + { + this.creditLimit = creditLimit; + } + + public BigDecimal getCreditLimit() + { + return creditLimit; + } + public void setGoogleSub(String googleSub) + { + this.googleSub = googleSub; + } + + public String getGoogleSub() + { + return googleSub; + } + public void setGoogleEmail(String googleEmail) + { + this.googleEmail = googleEmail; + } + + public String getGoogleEmail() + { + return googleEmail; + } + public void setGoogleName(String googleName) + { + this.googleName = googleName; + } + + public String getGoogleName() + { + return googleName; + } + public void setGooglePicture(String googlePicture) + { + this.googlePicture = googlePicture; + } + + public String getGooglePicture() + { + return googlePicture; + } + public void setDistTokenAddress(String distTokenAddress) + { + this.distTokenAddress = distTokenAddress; + } + + public String getDistTokenAddress() + { + return distTokenAddress; + } @Override public String toString() { @@ -143,6 +253,15 @@ public class Apps extends BaseEntity .append("createdAt", getCreatedAt()) .append("updatedAt", getUpdatedAt()) .append("deletedAt", getDeletedAt()) + .append("trxBalance", getTrxBalance()) + .append("usdtBalance", getUsdtBalance()) + .append("publicKey", getPublicKey()) + .append("creditLimit", getCreditLimit()) + .append("googleSub", getGoogleSub()) + .append("googleEmail", getGoogleEmail()) + .append("googleName", getGoogleName()) + .append("googlePicture", getGooglePicture()) + .append("distTokenAddress", getDistTokenAddress()) .toString(); } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/AppsPlus.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/AppsPlus.java index 8abe87f..38f3bc6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/AppsPlus.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/AppsPlus.java @@ -1,11 +1,8 @@ package com.ruoyi.system.domain; +import java.math.BigDecimal; import java.util.Date; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonProperty; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; @@ -14,10 +11,10 @@ import java.io.Serializable; import java.util.Date; import com.baomidou.mybatisplus.annotation.TableName; /** - * 应用管理对象 apps + * 平台商户对象 apps * * @author luqj - * @date 2025-11-25 + * @date 2026-10-08 */ @TableName(value = "apps") public class AppsPlus implements Serializable @@ -25,13 +22,12 @@ public class AppsPlus implements Serializable private static final long serialVersionUID = 1L; /** 主键 */ - @TableId(type = IdType.INPUT) private Long id; - /** 用户 */ - @Excel(name = "用户") + /** 用户ID */ + @Excel(name = "用户ID") private Long userId; - /** 名称 */ - @Excel(name = "名称") + /** 商户名称 */ + @Excel(name = "商户名称") private String name; /** 描述 */ @Excel(name = "描述") @@ -39,9 +35,6 @@ public class AppsPlus implements Serializable /** 状态 */ @Excel(name = "状态") private Integer status; - - @Excel(name = "归集地址") - private String distTokenAddress; /** 创建时间 */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") @@ -51,7 +44,36 @@ public class AppsPlus implements Serializable @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd") private Date updatedAt; /** 删除时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "删除时间", width = 30, dateFormat = "yyyy-MM-dd") private Date deletedAt; + /** trx账号 */ + @Excel(name = "trx账号金额") + private BigDecimal trxBalance; + /** usdt账号 */ + @Excel(name = "usdt账号金额") + private BigDecimal usdtBalance; + /** 公钥 */ + @Excel(name = "公钥") + private String publicKey; + /** 信用额度 */ + @Excel(name = "信用额度金额") + private BigDecimal creditLimit; + /** Google OpenID Connect subject ID */ + @Excel(name = "Google OpenID Connect subject ID") + private String googleSub; + /** Google账号邮箱 */ + @Excel(name = "Google账号邮箱") + private String googleEmail; + /** Google账号名称 */ + @Excel(name = "Google账号名称") + private String googleName; + /** Google头像URL */ + @Excel(name = "Google头像URL") + private String googlePicture; + /** 归集地址 */ + @Excel(name = "归集地址") + private String distTokenAddress; public void setId(Long id) { this.id = id; @@ -124,15 +146,88 @@ public class AppsPlus implements Serializable { return deletedAt; } - - public String getDistTokenAddress() { - return distTokenAddress; + public void setTrxBalance(BigDecimal trxBalance) + { + this.trxBalance = trxBalance; } - public void setDistTokenAddress(String distTokenAddress) { + public BigDecimal getTrxBalance() + { + return trxBalance; + } + public void setUsdtBalance(BigDecimal usdtBalance) + { + this.usdtBalance = usdtBalance; + } + + public BigDecimal getUsdtBalance() + { + return usdtBalance; + } + public void setPublicKey(String publicKey) + { + this.publicKey = publicKey; + } + + public String getPublicKey() + { + return publicKey; + } + public void setCreditLimit(BigDecimal creditLimit) + { + this.creditLimit = creditLimit; + } + + public BigDecimal getCreditLimit() + { + return creditLimit; + } + public void setGoogleSub(String googleSub) + { + this.googleSub = googleSub; + } + + public String getGoogleSub() + { + return googleSub; + } + public void setGoogleEmail(String googleEmail) + { + this.googleEmail = googleEmail; + } + + public String getGoogleEmail() + { + return googleEmail; + } + public void setGoogleName(String googleName) + { + this.googleName = googleName; + } + + public String getGoogleName() + { + return googleName; + } + public void setGooglePicture(String googlePicture) + { + this.googlePicture = googlePicture; + } + + public String getGooglePicture() + { + return googlePicture; + } + public void setDistTokenAddress(String distTokenAddress) + { this.distTokenAddress = distTokenAddress; } + public String getDistTokenAddress() + { + return distTokenAddress; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -144,6 +239,15 @@ public class AppsPlus implements Serializable .append("createdAt", getCreatedAt()) .append("updatedAt", getUpdatedAt()) .append("deletedAt", getDeletedAt()) + .append("trxBalance", getTrxBalance()) + .append("usdtBalance", getUsdtBalance()) + .append("publicKey", getPublicKey()) + .append("creditLimit", getCreditLimit()) + .append("googleSub", getGoogleSub()) + .append("googleEmail", getGoogleEmail()) + .append("googleName", getGoogleName()) + .append("googlePicture", getGooglePicture()) + .append("distTokenAddress", getDistTokenAddress()) .toString(); } } diff --git a/ruoyi-system/src/main/resources/mapper/system/AppsMapper.xml b/ruoyi-system/src/main/resources/mapper/system/AppsMapper.xml index c73efa3..0c6773d 100644 --- a/ruoyi-system/src/main/resources/mapper/system/AppsMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/AppsMapper.xml @@ -13,16 +13,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + - select id, user_id, name, dist_token_address, description, status, created_at, updated_at, deleted_at from apps + select id, user_id, name, description, status, created_at, updated_at, deleted_at, trx_balance, usdt_balance, public_key, credit_limit, google_sub, google_email, google_name, google_picture, dist_token_address from apps @@ -49,6 +65,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" created_at, updated_at, deleted_at, + trx_balance, + usdt_balance, + public_key, + credit_limit, + google_sub, + google_email, + google_name, + google_picture, dist_token_address, @@ -59,6 +83,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{createdAt}, #{updatedAt}, #{deletedAt}, + #{trxBalance}, + #{usdtBalance}, + #{publicKey}, + #{creditLimit}, + #{googleSub}, + #{googleEmail}, + #{googleName}, + #{googlePicture}, #{distTokenAddress}, @@ -73,6 +105,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" created_at = #{createdAt}, updated_at = #{updatedAt}, deleted_at = #{deletedAt}, + trx_balance = #{trxBalance}, + usdt_balance = #{usdtBalance}, + public_key = #{publicKey}, + credit_limit = #{creditLimit}, + google_sub = #{googleSub}, + google_email = #{googleEmail}, + google_name = #{googleName}, + google_picture = #{googlePicture}, dist_token_address = #{distTokenAddress}, where id = #{id} @@ -88,4 +128,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} - + \ No newline at end of file