From 15c07d04e82f8ba66e891b25d84379ea76b4e1aa Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Mon, 15 Apr 2019 13:29:22 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=B0=8F=E7=A8=8B=E5=BA=8F=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E5=8F=8A=E4=BA=8C=E7=BB=B4=E7=A0=81][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=BF=E9=97=AE=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/domain/po/WxCampaign.java | 12 ++++------- .../iformall/domain/po/WxCouponChannel.java | 20 ++++++++----------- .../java/com/iformall/domain/po/WxGame.java | 12 ++++------- .../java/com/iformall/domain/po/WxTopic.java | 14 +++++-------- .../mapper/WxCouponChannelMapper.xml | 1 + 5 files changed, 22 insertions(+), 37 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java index 2258a8a5e..e135aef2c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java @@ -227,21 +227,17 @@ public class WxCampaign implements Serializable { } public String getWeappPath() { + if(type == null) + return "pages/index/index"; return "pages/index/index?type=bd&bt="+type+"&id="+id; } - public void setWeappPath(String weappPath) { - this.weappPath = weappPath; - } - public String getWeappScene() { + if(type == null) + return ""; return "t:bt:" + type + ":" +id; } - public void setWeappScene(String weappScene) { - this.weappScene = weappScene; - } - public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java index b89d44cf1..08f2f5c2c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java @@ -217,29 +217,25 @@ public class WxCouponChannel implements Serializable { } public String getWeaAppPath() { + if(type == null) + return "pages/index/index"; if(!type.equals(EnumCouponType.COUPON_GROUP.getCode())) { - return "pages/index/index?type=sd&couponChannelId=" + id; - } else { return "pages/index/index?type=cd&couponChannelId=" + id; + } else { + return "pages/index/index?type=sd&couponChannelId=" + id; } } - public void setWeaAppPath(String weaAppPath) { - this.weaAppPath = weaAppPath; - } - public String getWeaAppScene() { + if(type == null) + return ""; if(!type.equals(EnumCouponType.COUPON_GROUP.getCode())) { - return "t:sd:" + id; - } else { return "t:cd:" + id; + } else { + return "t:sd:" + id; } } - public void setWeaAppScene(String weaAppScene) { - this.weaAppScene = weaAppScene; - } - public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxGame.java b/mallinkService/src/main/java/com/iformall/domain/po/WxGame.java index 6c2cf043c..2deb77beb 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxGame.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxGame.java @@ -254,21 +254,17 @@ public class WxGame implements Serializable { } public String getWeappPath() { + if (id == null) + return "pages/index/index"; return "pages/index/index?type=gm&id="+id; } - public void setWeappPath(String weappPath) { - this.weappPath = weappPath; - } - public String getWeappScene() { + if(id == null) + return ""; return "t:gm"+id; } - public void setWeappScene(String weappScene) { - this.weappScene = weappScene; - } - public void setGameTemplate(WxGameTemplate gameTemplate) { if (gameTemplate != null) { this.imgUrl = gameTemplate.getImgUrl(); 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 3ad82d81c..5d0568cbe 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java @@ -240,18 +240,14 @@ public class WxTopic implements Serializable { } public String getWeappPath() { - return "pages/index/index?type=td&id="+id; - } - - public void setWeappPath(String weappPath) { - this.weappPath = weappPath; + if(id == null) + return "pages/index/index"; + return "pages/index/index?type=td&id="+id; } public String getWeappScene() { + if(id == null) + return ""; return "t:td:" + id; } - - public void setWeappScene(String weappScene) { - this.weappScene = weappScene; - } } diff --git a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml index 85b876cf8..682e5d3f9 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml @@ -174,6 +174,7 @@ +