diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBusiness.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBusiness.java index e222d5dc2..185c9cee2 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBusiness.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBusiness.java @@ -2,7 +2,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseTenantEntity; +import com.iformall.domain.po.base.TenantVEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -11,7 +11,7 @@ import java.util.Date; @TableName(value = "wx_business") @Data @EqualsAndHashCode(callSuper = true) -public class WxBusiness extends BaseTenantEntity { +public class WxBusiness extends TenantVEntity { protected Integer id; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java index 10ec35f31..cdc4e68f1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java @@ -1,5 +1,7 @@ package com.iformall.domain.po.base; +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -13,6 +15,10 @@ public class BaseTenantEntity extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; + @TableField(exist = false) + @JsonProperty(access = JsonProperty.Access.READ_ONLY) + private TenantEntity tenantInfo; + public void updateTenantInfo(TenantEntity info) { setTenantId(info.getTenantId()); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/base/TenantVEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/base/TenantVEntity.java new file mode 100644 index 000000000..26c8f7f60 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/po/base/TenantVEntity.java @@ -0,0 +1,37 @@ +package com.iformall.domain.po.base; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * @author Stormeye + * @date 2019/4/24 14:32 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class TenantVEntity extends BaseEntity { + + @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + private String tenantId; + + @TableField(exist = false) + @JsonProperty(access = JsonProperty.Access.READ_ONLY) + private TenantEntity tenantInfo; + + public void updateTenantInfo(TenantEntity info) { + setTenantId(info.getTenantId()); + } + + public void updateTenantInfo(TenantVEntity info) { + setTenantId(info.getTenantId()); + } + + public TenantEntity getTenantInfo() { + return new TenantEntity() {{ + setTenantId(tenantId); + }}; + } +}