修改实体内容

service/trade-service-source/trade-service-source-dao/src/main/java/com/hchbox/entity/master/TopTrade.java

@@ -257,7 +257,7 @@ public class TopTrade implements Serializable {
     private String sellerNick;
 
     @Column(name = "seller_phone")
-    @ApiModelProperty(value = "卖家电环号码")
+    @ApiModelProperty(value = "卖家电话号码")
     private String sellerPhone;
 
     @Column(name = "seller_rate")

trade-common/src/main/java/com/hchbox/model/entity/BaseSellerAccount.java

@@ -9,7 +9,9 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 import javax.persistence.Column;
 import javax.persistence.EntityListeners;
 import javax.persistence.MappedSuperclass;
+import javax.persistence.Transient;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -24,52 +26,86 @@ public class BaseSellerAccount implements Serializable {
 
     private static final long serialVersionUID = 8623354712013889005L;
 
-    @Column(name = "team_nick")
-    @ApiModelProperty(value = "所属团队")
-    private String teamNick;
-
-    @Column(name = "seller_nick")
-    @ApiModelProperty(value = "卖家昵称")
-    private String sellerNick;
-
     @CreatedDate
     @Column(name = "create_time")
     @ApiModelProperty(value = "创建时间")
     private Date createTime;
 
-    @Column(name = "status")
+    @Column(name = "nickname")
-    @ApiModelProperty(value = "状态值")
+    @ApiModelProperty(value = "昵称")
-    private Integer status;
+    private String nickname;
+
+    @Column(name = "avatar")
+    @ApiModelProperty(value = "头像")
+    private String avatar;
+
+
+    @Column(name = "level")
+    @ApiModelProperty(value = "账号等级")
+    private Integer level;
+
+    @Column(name = "shop_type")
+    @ApiModelProperty(value = "店铺类型")
+    private String shopType;
+
+    @Column(name = "credit_level")
+    @ApiModelProperty(value = "信用等级")
+    private Integer creditLevel;
 
-    @Column(name = "remark")
+    @Column(name = "credit_score")
-    @ApiModelProperty(value = "备注")
+    @ApiModelProperty(value = "信用评分")
-    private String remark;
+    private Integer creditScore;
 
-    @Column(name = "type")
+    @Column(name = "app_key")
-    @ApiModelProperty(value = "0 旺旺 1 通道1账号密码")
+    @ApiModelProperty(value = "当前登录的appKey")
-    private Integer type;
+    private String appKey;
 
-    @Column(name = "open_channel")
+    @Column(name = "session_key")
-    @ApiModelProperty(value = "开通渠道")
+    @ApiModelProperty(value = "当前登录的appKey")
-    private Integer openChannel;
+    private String sessionKey;
+
+    @Column(name = "sell_count")
+    @ApiModelProperty(value = "近30天店铺销量")
+    private Integer sellCount;
+
+    @Column(name = "shop_title")
+    @ApiModelProperty(value = "店铺名称")
+    private String shopTitle;
+
+    @Column(name = "on_sale_item")
+    @ApiModelProperty(value = "出售中宝贝数")
+    private Integer onSaleItem;
+
+    @Column(name = "last_login_time")
+    @ApiModelProperty(value = "最后登录时间")
+    private Date lastLoginTime;
+
+    @Transient
+    @ApiModelProperty("是否子账号")
+    private Boolean isSubAccount;
 
     @Column(name = "expiration_time")
     @ApiModelProperty(value = "过期天数")
     private Date expirationTime ;
 
-    @Column(name = "vip_status")
+    @Column(name = "message_count")
-    @ApiModelProperty(value = "VIP状态")
+    @ApiModelProperty(value = "旺旺群发剩余数量")
-    private Integer vipStatus;
+    private Integer messageCount;
 
-    @Column(name = "task_count")
+    @Column(name = "sms_count")
-    @ApiModelProperty(value = "总共提交任务数")
+    @ApiModelProperty(value = "短信条数")
-    private Integer taskCount;
+    private Integer smsCount;
 
-    @Column(name = "vip_level")
-    @ApiModelProperty(value = "vip等级")
-    private Integer vipLevel;
 
-    @Column(name = "message_send_count")
+    @Column(name = "parent_id")
-    @ApiModelProperty(value = "旺旺已发送数量")
+    @ApiModelProperty(value = "父类id")
-    private Integer messageSendCount;
+    private Long parentId;
+
+    @Column(name = "status")
+    @ApiModelProperty(value = "账号状态值 1:正常使用 -1不能使用")
+    private Integer status;
+
+    @Column(name = "account_balance")
+    @ApiModelProperty(value = "账户余额")
+    private BigDecimal accountBalance;
 }