From 7b64b0717f80bbdaa5a71cf59c94e21df992047e Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Thu, 7 Nov 2019 16:13:31 +0800 Subject: [PATCH] =?UTF-8?q?[=E9=9B=86=E5=9B=A2=E7=89=88][=E6=96=B0?= =?UTF-8?q?=E5=A2=9E]:float=20layer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/tenant/TenantInfoImpl.java | 3 +++ .../src/main/java/com/iformall/tenant/TenantInfoImpl.java | 3 +++ .../src/main/java/com/iformall/tenant/TenantInfoImpl.java | 3 +++ .../main/java/com/iformall/domain/po/WxFloatingLayer.java | 4 ++-- .../service/impl/WxCuserFloatingLayerServiceImpl.java | 7 +++++-- 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java b/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java index 874c38928..460db452c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java +++ b/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java @@ -127,6 +127,9 @@ public class TenantInfoImpl implements TenantInfo { if ("wx_cuser_floating_layer".equals(tableName)) { return true; } + if ("wx_floating_layer".equals(tableName)) { + return true; + } if ("wx_question".equals(tableName)) { return true; } diff --git a/mallinkBApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java b/mallinkBApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java index 5fcc6df30..50c4d445f 100644 --- a/mallinkBApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java +++ b/mallinkBApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java @@ -120,6 +120,9 @@ public class TenantInfoImpl implements TenantInfo { if ("wx_buser".equals(tableName)) { return true; } + if ("wx_floating_layer".equals(tableName)) { + return true; + } if ("wx_user_visit".equals(tableName)) { return true; } diff --git a/mallinkCApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java b/mallinkCApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java index 81c1e6414..3d81a5187 100644 --- a/mallinkCApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java +++ b/mallinkCApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java @@ -117,6 +117,9 @@ public class TenantInfoImpl implements TenantInfo { if ("wx_cuser_floating_layer".equals(tableName)) { return true; } + if ("wx_floating_layer".equals(tableName)) { + return true; + } if ("wx_question".equals(tableName)) { return true; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxFloatingLayer.java b/mallinkService/src/main/java/com/iformall/domain/po/WxFloatingLayer.java index 137735dad..179b57ea8 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxFloatingLayer.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxFloatingLayer.java @@ -1,7 +1,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.TenantEntity; +import com.iformall.domain.po.base.BaseTenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -10,7 +10,7 @@ import java.util.Date; @TableName(value = "wx_floating_layer") @Data @EqualsAndHashCode(callSuper = true) -public class WxFloatingLayer extends TenantEntity { +public class WxFloatingLayer extends BaseTenantEntity { protected Long id; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCuserFloatingLayerServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCuserFloatingLayerServiceImpl.java index 8e46e6795..ed290fced 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCuserFloatingLayerServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCuserFloatingLayerServiceImpl.java @@ -56,8 +56,11 @@ public class WxCuserFloatingLayerServiceImpl implements WxCuserFloatingLayerServ wxCuserFloatingLayerQuery.setUserId(byOpenId.getId()); WxCuserFloatingLayer wxCuserFloatingLayer = wxCuserFloatingLayerMapper.selectOne(new QueryWrapper<>(wxCuserFloatingLayerQuery)); if (wxCuserFloatingLayer == null) { - saveCuserFloatingLayer(byOpenId); - return getWxFloatingLayer(byOpenId); + WxFloatingLayer wxFloatingLayer = getWxFloatingLayer(byOpenId); + if (wxFloatingLayer != null) { + saveCuserFloatingLayer(byOpenId); + } + return wxFloatingLayer; } return null; }