From fce977a7ef8d29e2fa7c36e1f1d07e7039497de2 Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 13 Dec 2021 12:10:08 +0800 Subject: [PATCH] =?UTF-8?q?/=E3=80=81topic=5Ftype?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/domain/po/WxTopic.java | 8 ++------ .../com/iformall/service/impl/WxTopicServiceImpl.java | 3 +++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java b/mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java index f83842f36..73f8bca52 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java @@ -83,9 +83,7 @@ public class WxTopic extends TenantEntity { public String getWeappPath() { - if(id == null) - return Constant.mainPageUrl; - if(EnumWxTopicType.SPECIAL_TOPIC.getCode().equals(topicType)) + if(EnumWxTopicType.SPECIAL_TOPIC.getCode().equals(topicType) && id != null) return Constant.mainPageUrl + "?type=td&id="+id; if(EnumWxTopicType.FLASH_SALE.getCode().equals(topicType)) return Constant.mainPageUrl + "?type=rb"; @@ -101,9 +99,7 @@ public class WxTopic extends TenantEntity { } public String getWeappScene() { - if(id == null) - return ""; - if(EnumWxTopicType.SPECIAL_TOPIC.getCode().equals(topicType)) + if(EnumWxTopicType.SPECIAL_TOPIC.getCode().equals(topicType) && id != null) return "t:td:" + id; return ""; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java index 25a47d7f7..4f95f00ae 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java @@ -70,6 +70,9 @@ public class WxTopicServiceImpl implements WxTopicService { @Override public WxTopic show(WxTopic record) { WxTopic wxTopic = wxTopicMapper.show(record); + if(wxTopic == null && !EnumWxTopicType.SPECIAL_TOPIC.getCode().equals(record.getTopicType())){ + wxTopic = record; + } if(wxTopic != null) { addCouponList(wxTopic); }