From ffbb353911b09137e092dbf4cf01fad1b91cdd97 Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 13 Dec 2021 18:38:01 +0800 Subject: [PATCH] =?UTF-8?q?/=E3=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/enums/EnumAppModelType.java | 4 ++-- .../java/com/iformall/service/impl/WxTopicServiceImpl.java | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumAppModelType.java b/mallinkService/src/main/java/com/iformall/enums/EnumAppModelType.java index 414ce4059..8d5c8b7d4 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumAppModelType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumAppModelType.java @@ -4,8 +4,8 @@ package com.iformall.enums; * Created by */ public enum EnumAppModelType { - CLASSICS(1, "经典模板"), - NEW_EDITION(2, "新版风格"), + CLASSICS(0, "经典模板"), + NEW_EDITION(1, "新版风格"), ; 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 4f95f00ae..6b6d74f5c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java @@ -73,7 +73,7 @@ public class WxTopicServiceImpl implements WxTopicService { if(wxTopic == null && !EnumWxTopicType.SPECIAL_TOPIC.getCode().equals(record.getTopicType())){ wxTopic = record; } - if(wxTopic != null) { + if(wxTopic != null && !EnumYesOrNo.YES.getCode().equals(wxTopic.getIsOnlyAd())) { addCouponList(wxTopic); } return wxTopic; @@ -83,7 +83,9 @@ public class WxTopicServiceImpl implements WxTopicService { public List showList(WxTopic record) { List topicList = wxTopicMapper.showList(record); for (WxTopic topic:topicList) { - addCouponList(topic); + if(!EnumYesOrNo.YES.getCode().equals(topic.getIsOnlyAd())){ + addCouponList(topic); + } } return topicList; }