Browse Source

/、tenant

release_toaliyun_real
xhxu 4 years ago
parent
commit
82c72da30c
5 changed files with 29 additions and 43 deletions
  1. +0
    -9
      mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoDto.java
  2. +9
    -9
      mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java
  3. +12
    -15
      mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java
  4. +4
    -4
      mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntityWithoutFinalTenantId.java
  5. +4
    -6
      mallinkService/src/main/java/com/iformall/domain/po/base/TenantVEntity.java

+ 0
- 9
mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoDto.java View File

@@ -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<WxCUserBasicInfoFilterDto> filterList;

public void undateFinalTenantId(TenantEntity tenantEntity){
setFinalTenantId(tenantEntity.getTenantId());
if(StringUtils.isNotBlank(tenantEntity.getParentTenantId())){
setFinalTenantId(tenantEntity.getParentTenantId());
}
}
}

+ 9
- 9
mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java View File

@@ -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() {


+ 12
- 15
mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java View File

@@ -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) {


+ 4
- 4
mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntityWithoutFinalTenantId.java View File

@@ -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();
}
}



+ 4
- 6
mallinkService/src/main/java/com/iformall/domain/po/base/TenantVEntity.java View File

@@ -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();
}
}



Loading…
Cancel
Save