From 81e572932f5606aa7c284a38fc430cabac203cbb Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 14 Jan 2019 11:58:24 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=95=86=E6=88=B7][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/domain/po/WxMerchant.java | 12 ++++++++++++ .../src/main/resources/mapper/WxMerchantMapper.xml | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) 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 98c4557fb..11e5c8725 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -144,6 +144,10 @@ public class WxMerchant implements Serializable { @io.swagger.annotations.ApiModelProperty(value="VIP折扣率3",name="vipDiscountRate3") private Integer vipDiscountRate3; + @io.swagger.annotations.ApiModelProperty(value = "类型", name = "type") + private Integer type; + + public List> getShoplist() { return shoplist; } @@ -388,6 +392,14 @@ public class WxMerchant implements Serializable { this.accountParameter = accountParameter; } + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index ea13f8152..f74a3af44 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -19,11 +19,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`,`vip_discount_rate1`,`vip_discount_rate2`,`vip_discount_rate3` + `business_id`,`shop_type`,`brand`,`vip_discount_rate1`,`vip_discount_rate2`,`vip_discount_rate3`,`type` @@ -74,6 +76,9 @@ and `link_person` = #{linkPerson} + + and `type` = #{type} + and id in