diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMallApply.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMallApply.java index c6b277b06..b92f9f099 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMallApply.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMallApply.java @@ -12,7 +12,6 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = true) public class WxMallApply extends BaseEntity { - private static final long serialVersionUID = 1L; protected Long id; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxQuestion.java b/mallinkService/src/main/java/com/iformall/domain/po/WxQuestion.java index ba7100155..ffbfd2cf0 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxQuestion.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxQuestion.java @@ -1,19 +1,17 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.BaseTenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @TableName(value = "wx_question") @Data @EqualsAndHashCode(callSuper = true) -public class WxQuestion extends BaseEntity { +public class WxQuestion extends BaseTenantEntity { protected Long id; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="问题内容",name="content") private String content; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxQuestionConfig.java b/mallinkService/src/main/java/com/iformall/domain/po/WxQuestionConfig.java index 7fe575efe..c52580b66 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxQuestionConfig.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxQuestionConfig.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.BaseEntity; +import com.iformall.domain.po.base.BaseTenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -12,13 +12,10 @@ import java.util.List; @TableName(value = "wx_question_config") @Data @EqualsAndHashCode(callSuper = true) -public class WxQuestionConfig extends BaseEntity { +public class WxQuestionConfig extends BaseTenantEntity { protected Long id; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; - @io.swagger.annotations.ApiModelProperty(value="问题列表",name="questionList") private String questionList; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxQuestionLog.java b/mallinkService/src/main/java/com/iformall/domain/po/WxQuestionLog.java index 97e301bdd..612cf31be 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxQuestionLog.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxQuestionLog.java @@ -1,7 +1,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.BaseTenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -11,12 +11,10 @@ import java.util.Date; @TableName(value = "wx_question_log") @Data @EqualsAndHashCode(callSuper = true) -public class WxQuestionLog extends BaseEntity { +public class WxQuestionLog extends BaseTenantEntity { protected Long id; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="用户ID",name="userId") private Long userId; @io.swagger.annotations.ApiModelProperty(value="问题ID",name="questionId") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxScoreRules.java b/mallinkService/src/main/java/com/iformall/domain/po/WxScoreRules.java index 07d95f6cd..13321e35e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxScoreRules.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxScoreRules.java @@ -3,7 +3,7 @@ package com.iformall.domain.po; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.BaseTenantEntity; import com.iformall.enums.EnumScoreType; import lombok.Data; import lombok.EqualsAndHashCode; @@ -25,7 +25,7 @@ import java.util.List; @TableName(value = "wx_score_rules") @Data @EqualsAndHashCode(callSuper = true) -public class WxScoreRules extends BaseEntity { +public class WxScoreRules extends BaseTenantEntity { @TableField(exist = false) public static final int DEFAULT_SCALE = 10; @@ -89,10 +89,6 @@ public class WxScoreRules extends BaseEntity { protected Long id; - - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; - @io.swagger.annotations.ApiModelProperty(value="规则",name="rules") private String rules; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxUserVisit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxUserVisit.java index 9365a8b7a..a9a0261e9 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxUserVisit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxUserVisit.java @@ -1,7 +1,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.BaseTenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -10,7 +10,7 @@ import java.util.*; @TableName(value = "wx_user_visit") @Data @EqualsAndHashCode(callSuper = true) -public class WxUserVisit extends BaseEntity { +public class WxUserVisit extends BaseTenantEntity { protected Long id; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxWeappAuditStatus.java b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappAuditStatus.java index 53a82df58..ec92248da 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxWeappAuditStatus.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappAuditStatus.java @@ -1,7 +1,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.BaseTenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -10,15 +10,12 @@ import java.util.Date; @TableName(value = "wx_weapp_audit_status") @Data @EqualsAndHashCode(callSuper = true) -public class WxWeappAuditStatus extends BaseEntity { +public class WxWeappAuditStatus extends BaseTenantEntity { private static final long serialVersionUID = 1L; protected Long id; - - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="小程序ID",name="appId") private String appId; @io.swagger.annotations.ApiModelProperty(value="小程序类型(1-B端 2-C端)",name="type") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxWeappCodeStatus.java b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappCodeStatus.java index 3eb05152d..4d32c9b58 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxWeappCodeStatus.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappCodeStatus.java @@ -1,7 +1,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.BaseTenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -10,14 +10,11 @@ import java.util.Date; @TableName(value = "wx_weapp_code_status") @Data @EqualsAndHashCode(callSuper = true) -public class WxWeappCodeStatus extends BaseEntity { +public class WxWeappCodeStatus extends BaseTenantEntity { private static final long serialVersionUID = 1L; protected Long id; - - - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; + @io.swagger.annotations.ApiModelProperty(value="小程序ID",name="appId") private String appId; @io.swagger.annotations.ApiModelProperty(value="小程序类型(1-B端 2-C端 3-公众服务号 4-公众订阅号)",name="type") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxWeappReleaseStatus.java b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappReleaseStatus.java index 3a3f7b3ad..0a77d91b2 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxWeappReleaseStatus.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappReleaseStatus.java @@ -1,7 +1,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.BaseTenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -10,7 +10,7 @@ import java.util.Date; @TableName(value = "wx_weapp_release_status") @Data @EqualsAndHashCode(callSuper = true) -public class WxWeappReleaseStatus extends BaseEntity { +public class WxWeappReleaseStatus extends BaseTenantEntity { private static final long serialVersionUID = 1L; protected Long 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 c440a7850..5bd778d7a 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 @@ -12,4 +12,12 @@ import lombok.EqualsAndHashCode; public class BaseTenantEntity extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; + + public void setTenantInfo(TenantEntity info) { + setTenantId(info.getTenantId()); + } + + public void setTenantInfo(BaseTenantEntity info) { + setTenantId(info.getTenantId()); + } } 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 f8d892f7b..120b3285f 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 @@ -12,4 +12,12 @@ import lombok.EqualsAndHashCode; public class TenantEntity extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; + + public void setTenantInfo(TenantEntity info) { + setTenantId(info.getTenantId()); + } + + public void setTenantInfo(BaseTenantEntity info) { + setTenantId(info.getTenantId()); + } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestBaseEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestBaseEntity.java index 1cfa8d6ad..66433fa4c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestBaseEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestBaseEntity.java @@ -3,9 +3,9 @@ package com.iformall.domain.po.invest; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.*; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; -import java.io.Serializable; import java.util.*; /** @@ -13,9 +13,7 @@ import java.util.*; * @date 2019/4/24 14:32 */ @Data -public class InvestBaseEntity implements Serializable { - - private static final long serialVersionUID = 1L; +public class InvestBaseEntity extends TenantEntity { public static final String COLUMN_TYPE = "json"; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxFloatingLayerVO.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxFloatingLayerVO.java index 15b341952..bc6443c96 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxFloatingLayerVO.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxFloatingLayerVO.java @@ -1,6 +1,6 @@ package com.iformall.domain.vo; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.BaseTenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -8,14 +8,10 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = true) -public class WxFloatingLayerVO extends BaseEntity { - private static final long serialVersionUID = 1L; +public class WxFloatingLayerVO extends BaseTenantEntity { protected Long id; - @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") - private String tenantId; - @io.swagger.annotations.ApiModelProperty(value = "封面图", name = "coverImg") private String coverImg;