diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoDto.java index faa65993f..8e47e1b01 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoDto.java @@ -21,9 +21,6 @@ import java.util.List; public class WxCUserBasicInfoDto extends TenantEntity { protected Long id; - - @io.swagger.annotations.ApiModelProperty(value="如果是集团版的,存集团版的tenantId,如果是商场,则存商场",name="sex") - private String finalTenantId; @io.swagger.annotations.ApiModelProperty(value="开始时间",name="startTime") private Date startTime; @@ -80,10 +77,4 @@ public class WxCUserBasicInfoDto extends TenantEntity { @TableField(exist = false) protected List filterList; - public void undateFinalTenantId(TenantEntity tenantEntity){ - setFinalTenantId(tenantEntity.getTenantId()); - if(StringUtils.isNotBlank(tenantEntity.getParentTenantId())){ - setFinalTenantId(tenantEntity.getParentTenantId()); - } - } } 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 610520691..06b8f2fb0 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 @@ -28,9 +28,10 @@ public class BaseTenantEntity extends BaseEntity { public String getFinalTenantId() { if (StringUtils.isNotBlank(parentTenantId)) { - return parentTenantId; + finalTenantId = parentTenantId; } - return tenantId; + finalTenantId = tenantId; + return finalTenantId; } public void setFinalTenantId(String finalTenantId) { @@ -49,20 +50,19 @@ public class BaseTenantEntity extends BaseEntity { } public void updateTenantInfo(TenantEntity info) { - log.info("info.tenantId:"+info.getTenantId()+". info.parentTenantId:"+info.getParentTenantId()+"."); - setTenantId(info.getTenantId()); - setParentTenantId(null); + tenantId = info.getTenantId(); if (StringUtils.isNotBlank(info.getParentTenantId())) { - setParentTenantId(info.getParentTenantId()); + parentTenantId = info.getParentTenantId(); } + getFinalTenantId(); } public void updateTenantInfo(BaseTenantEntity info) { - setTenantId(info.getTenantId()); - setParentTenantId(null); + tenantId = info.getTenantId(); if (StringUtils.isNotBlank(info.getParentTenantId())) { - setParentTenantId(info.getParentTenantId()); + parentTenantId = info.getParentTenantId(); } + getFinalTenantId(); } // public TenantEntity getTenantInfo() { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java index 4736492f3..ef9986643 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java @@ -28,28 +28,27 @@ public class TenantEntity extends BaseEntity { protected String shardTableSuffix; public void updateTenantInfo(TenantEntity info) { - setTenantId(info.getTenantId()); - setParentTenantId(null); + tenantId = info.getTenantId(); if (StringUtils.isNotBlank(info.getParentTenantId())) { - setParentTenantId(info.getParentTenantId()); + parentTenantId = info.getParentTenantId(); } - setFinalTenantId(getFinalTenantId()); + getFinalTenantId(); } public void updateTenantInfo(BaseTenantEntity info) { - setTenantId(info.getTenantId()); - setParentTenantId(null); - if (StringUtils.isNotBlank(info.getParentTenantId())) { - setParentTenantId(info.getParentTenantId()); - } - setFinalTenantId(getFinalTenantId()); + tenantId = info.getTenantId(); + if (StringUtils.isNotBlank(info.getParentTenantId())) { + parentTenantId = info.getParentTenantId(); + } + getFinalTenantId(); } public String getFinalTenantId() { - if (!StringUtils.isBlank(parentTenantId)) { - return parentTenantId; + if (StringUtils.isNotBlank(parentTenantId)) { + finalTenantId = parentTenantId; } - return tenantId; + finalTenantId = tenantId; + return finalTenantId; } public String getShardTableSuffix() { @@ -65,7 +64,6 @@ public class TenantEntity extends BaseEntity { public void setTenantId(String tenantId) { this.tenantId = tenantId; - setFinalTenantId(getFinalTenantId()); } public String getParentTenantId() { @@ -74,7 +72,6 @@ public class TenantEntity extends BaseEntity { public void setParentTenantId(String parentTenantId) { this.parentTenantId = parentTenantId; - setFinalTenantId(getFinalTenantId()); } public void setFinalTenantId(String finalTenantId) { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntityWithoutFinalTenantId.java b/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntityWithoutFinalTenantId.java index 741d21cca..c6d9db89e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntityWithoutFinalTenantId.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntityWithoutFinalTenantId.java @@ -18,16 +18,16 @@ public class TenantEntityWithoutFinalTenantId extends BaseEntity { protected String parentTenantId; public void updateTenantInfo(TenantEntityWithoutFinalTenantId info) { - setTenantId(info.getTenantId()); + tenantId = info.getTenantId(); if (StringUtils.isNotBlank(info.getParentTenantId())) { - setParentTenantId(info.getParentTenantId()); + parentTenantId = info.getParentTenantId(); } } public void updateTenantInfo(BaseTenantEntity info) { - setTenantId(info.getTenantId()); + tenantId = info.getTenantId(); if (StringUtils.isNotBlank(info.getParentTenantId())) { - setParentTenantId(info.getParentTenantId()); + parentTenantId = info.getParentTenantId(); } } 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 index 47ee07caf..0d5ee1434 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/base/TenantVEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/base/TenantVEntity.java @@ -26,18 +26,16 @@ public class TenantVEntity extends BaseEntity { private TenantEntity tenantInfo; public void updateTenantInfo(TenantEntity info) { - setTenantId(info.getTenantId()); - setParentTenantId(null); + tenantId = info.getTenantId(); if (StringUtils.isNotBlank(info.getParentTenantId())) { - setParentTenantId(info.getParentTenantId()); + parentTenantId = info.getParentTenantId(); } } public void updateTenantInfo(TenantVEntity info) { - setTenantId(info.getTenantId()); - setParentTenantId(null); + tenantId = info.getTenantId(); if (StringUtils.isNotBlank(info.getParentTenantId())) { - setParentTenantId(info.getParentTenantId()); + parentTenantId = info.getParentTenantId(); } }