diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java index 2082d8a73..7e95e5271 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java @@ -1,10 +1,9 @@ package com.iformall.domain.po; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.iformall.domain.po.base.BaseCUserEntity; +import com.iformall.enums.EnumAppPlat; import com.iformall.utils.Constant; import lombok.Data; import lombok.EqualsAndHashCode; @@ -12,9 +11,7 @@ import lombok.ToString; import org.apache.commons.lang3.StringUtils; -import java.math.BigDecimal; import java.util.Date; -import java.util.List; import java.util.UUID; @TableName(value = "wx_c_user") @@ -24,6 +21,10 @@ import java.util.UUID; @EqualsAndHashCode(callSuper = true) public class WxCUser extends CUser { + static { + appPlat = EnumAppPlat.WX; + } + public String createToken(Date currentDate,String tenantId) { if(StringUtils.isBlank(tenantId)){ tenantId = "1"; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/base/BaseCUserEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/base/BaseCUserEntity.java index 101e06fbc..898ee1a4f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/base/BaseCUserEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/base/BaseCUserEntity.java @@ -1,20 +1,12 @@ package com.iformall.domain.po.base; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.annotation.TableField; -import com.iformall.domain.po.WxCUser; import com.iformall.enums.EnumAppPlat; -import com.iformall.utils.Constant; import com.iformall.utils.UserUtil; -import lombok.Data; import lombok.EqualsAndHashCode; import org.apache.commons.lang3.StringUtils; import java.util.Date; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.UUID; /** * @author Stormeye @@ -39,7 +31,7 @@ public class BaseCUserEntity extends TenantEntity { protected Object realUser; @TableField(exist = false) - protected EnumAppPlat appPlat; + protected static EnumAppPlat appPlat; /** * 是否是会员 diff --git a/mallinkService/src/main/java/com/iformall/domain/po/tt/TtCUser.java b/mallinkService/src/main/java/com/iformall/domain/po/tt/TtCUser.java index af54fc0d7..156cf10b9 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/tt/TtCUser.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/tt/TtCUser.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.iformall.domain.po.CUser; import com.iformall.domain.po.base.BaseCUserEntity; +import com.iformall.enums.EnumAppPlat; import com.iformall.utils.Constant; import lombok.Data; import lombok.EqualsAndHashCode; @@ -23,6 +24,10 @@ import java.util.UUID; @EqualsAndHashCode(callSuper = true) public class TtCUser extends CUser { + static { + appPlat = EnumAppPlat.TOUTIAO; + } + public String createToken(Date currentDate,String tenantId) { if(StringUtils.isBlank(tenantId)){ tenantId = "1"; diff --git a/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtCUserServiceAdapter.java b/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtCUserServiceAdapter.java index 2ba466cfb..dcbdf001d 100644 --- a/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtCUserServiceAdapter.java +++ b/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtCUserServiceAdapter.java @@ -60,7 +60,6 @@ public class TtCUserServiceAdapter extends BasicCUserService implements CUserSer entity.setUserId(ttCUser.getUserId()); entity.setToken(ttCUser.getToken()); entity.updateTenantInfo(ttCUser); - entity.setAppPlat(EnumAppPlat.TOUTIAO); entity.setRealUser(ttCUser); return entity; } diff --git a/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxCUserServiceAdapter.java b/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxCUserServiceAdapter.java index 93742800e..c4b0a79a7 100644 --- a/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxCUserServiceAdapter.java +++ b/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxCUserServiceAdapter.java @@ -63,7 +63,6 @@ public class WxCUserServiceAdapter extends BasicCUserService implements CUserSer entity.setUserId(wxCUser.getUserId()); entity.setToken(wxCUser.getToken()); entity.updateTenantInfo(wxCUser); - entity.setAppPlat(EnumAppPlat.WX); entity.setRealUser(wxCUser); return entity; }