From 6d75e677178c9c58e49d6a853990cddea1e94ed5 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 20 Mar 2019 15:57:51 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=95=86=E6=88=B7][=E6=B7=BB=E5=8A=A0][?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=98=BE=E7=A4=BA=E5=9C=A8C=E7=AB=AF]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/domain/po/WxMerchant.java | 11 +++++++++++ .../java/com/iformall/domain/vo/WxMerchantVo.java | 12 ++++++++++-- .../src/main/resources/mapper/WxMerchantMapper.xml | 9 +++++++-- 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java index 975a0f7bb..62bd5f563 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -140,6 +140,9 @@ public class WxMerchant implements Serializable { @io.swagger.annotations.ApiModelProperty(value = "类型", name = "type") private Integer type; + @io.swagger.annotations.ApiModelProperty(value = "是否显示在C端", name = "show") + private Integer show; + public List getLevelConfigList() { return levelConfigList; } @@ -377,6 +380,14 @@ public class WxMerchant implements Serializable { this.type = type; } + public Integer getShow() { + return show; + } + + public void setShow(Integer show) { + this.show = show; + } + public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java index 8e28a5579..8d0b46554 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java @@ -1,7 +1,5 @@ package com.iformall.domain.vo; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; - import javax.persistence.Id; public class WxMerchantVo { private static final long serialVersionUID = 6687964942922444531L; @@ -52,6 +50,16 @@ public class WxMerchantVo { @io.swagger.annotations.ApiModelProperty(value="楼层",name="floorName") private String floorName; + @io.swagger.annotations.ApiModelProperty(value = "是否显示在C端", name = "show") + private String show; + + public String getShow() { + return show; + } + + public void setShow(String show) { + this.show = show; + } public String getBuildingName() {return buildingName; } public void setBuildingName(String _building) { diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 990415d5e..0faac31b4 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -17,12 +17,13 @@ + `id`,`tenant_id`,`img_url`,`name`,`link_phone`,`create_date`,`update_date`,`car_vendor_type`,`car_params`,`status`,`link_person`, - `business_id`,`shop_type`,`brand`,`type` + `business_id`,`shop_type`,`brand`,`type`,`show` @@ -76,6 +77,9 @@ and `type` = #{type} + + and `show` = #{show} + and id in @@ -96,7 +100,7 @@ m.id, m.img_url,m.name,m.link_phone,m.status,m.business_id, s.addr,s.shop_number,s.baidu_poi, - mb.building_name,mf.floor_name + mb.building_name,mf.floor_name,m.show @@ -111,6 +115,7 @@ +