Browse Source

[PO][修改]:集团版预修改

release_toaliyun_real
Stormeye Wu 6 years ago
parent
commit
a75395cb7a
13 changed files with 37 additions and 45 deletions
  1. +0
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxMallApply.java
  2. +2
    -4
      mallinkService/src/main/java/com/iformall/domain/po/WxQuestion.java
  3. +2
    -5
      mallinkService/src/main/java/com/iformall/domain/po/WxQuestionConfig.java
  4. +2
    -4
      mallinkService/src/main/java/com/iformall/domain/po/WxQuestionLog.java
  5. +2
    -6
      mallinkService/src/main/java/com/iformall/domain/po/WxScoreRules.java
  6. +2
    -2
      mallinkService/src/main/java/com/iformall/domain/po/WxUserVisit.java
  7. +2
    -5
      mallinkService/src/main/java/com/iformall/domain/po/WxWeappAuditStatus.java
  8. +3
    -6
      mallinkService/src/main/java/com/iformall/domain/po/WxWeappCodeStatus.java
  9. +2
    -2
      mallinkService/src/main/java/com/iformall/domain/po/WxWeappReleaseStatus.java
  10. +8
    -0
      mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java
  11. +8
    -0
      mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java
  12. +2
    -4
      mallinkService/src/main/java/com/iformall/domain/po/invest/InvestBaseEntity.java
  13. +2
    -6
      mallinkService/src/main/java/com/iformall/domain/vo/WxFloatingLayerVO.java

+ 0
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxMallApply.java View File

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



+ 2
- 4
mallinkService/src/main/java/com/iformall/domain/po/WxQuestion.java View File

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



+ 2
- 5
mallinkService/src/main/java/com/iformall/domain/po/WxQuestionConfig.java View File

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



+ 2
- 4
mallinkService/src/main/java/com/iformall/domain/po/WxQuestionLog.java View File

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


+ 2
- 6
mallinkService/src/main/java/com/iformall/domain/po/WxScoreRules.java View File

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



+ 2
- 2
mallinkService/src/main/java/com/iformall/domain/po/WxUserVisit.java View File

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



+ 2
- 5
mallinkService/src/main/java/com/iformall/domain/po/WxWeappAuditStatus.java View File

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


+ 3
- 6
mallinkService/src/main/java/com/iformall/domain/po/WxWeappCodeStatus.java View File

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


+ 2
- 2
mallinkService/src/main/java/com/iformall/domain/po/WxWeappReleaseStatus.java View File

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


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

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

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

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

+ 2
- 4
mallinkService/src/main/java/com/iformall/domain/po/invest/InvestBaseEntity.java View File

@@ -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";



+ 2
- 6
mallinkService/src/main/java/com/iformall/domain/vo/WxFloatingLayerVO.java View File

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



Loading…
Cancel
Save