From 55ecb7b723633a7acc3b37ee907b88f5edea40ff Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 12 Dec 2018 12:23:10 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=95=86=E9=93=BA][=E6=B7=BB=E5=8A=A0][?= =?UTF-8?q?=E8=B4=9F=E8=B4=A3=E4=BA=BA=E4=B8=8E=E7=94=B5=E8=AF=9D=E5=AD=97?= =?UTF-8?q?=E6=AE=B5]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/domain/po/WxShop.java | 22 ++++++++++++++++ .../main/resources/mapper/WxShopMapper.xml | 25 ++++++++++++++++--- 2 files changed, 43 insertions(+), 4 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java b/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java index ad91fb338..6de701c94 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java @@ -98,6 +98,12 @@ public class WxShop implements Serializable { @io.swagger.annotations.ApiModelProperty(value="图片",name="imgUrl") private String imgUrl; + @io.swagger.annotations.ApiModelProperty(value="管理人",name="manager") + private String manager; + + @io.swagger.annotations.ApiModelProperty(value="管理人电话",name="managerPhone") + private String managerPhone; + public String getTenantId() { return tenantId; } @@ -221,6 +227,22 @@ public class WxShop implements Serializable { this.linkPhone = linkPhone; } + public String getManager() { + return manager; + } + + public void setManager(String manager) { + this.manager = manager; + } + + public String getManagerPhone() { + return managerPhone; + } + + public void setManagerPhone(String managerPhone) { + this.managerPhone = managerPhone; + } + public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") diff --git a/mallinkService/src/main/resources/mapper/WxShopMapper.xml b/mallinkService/src/main/resources/mapper/WxShopMapper.xml index d89d0b0a8..93be77ea4 100644 --- a/mallinkService/src/main/resources/mapper/WxShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxShopMapper.xml @@ -19,10 +19,14 @@ + + - `id`,`tenant_id`,`shop_number`,`build_area`,`operation_area`,`building`,`floor`,`status`,`x`,`y`,`addr`,`baidu_poi`,`longitude`,`latitude`,`create_date`,`update_date`,`img_url` + `id`,`tenant_id`,`shop_number`,`build_area`,`operation_area`,`building`, + `floor`,`status`,`x`,`y`,`addr`,`baidu_poi`,`longitude`,`latitude`,`create_date`, + `update_date`,`img_url`,`manager`,`manager_phone` @@ -107,6 +111,12 @@ and `update_date` = #{updateDate} + + and `manager` = #{manager} + + + and `manager_phone` = #{managerPhone} + and id in @@ -128,7 +138,7 @@ select s.id,s.shop_number shopNumber,s.build_area buildArea, s.img_url imgUrl,s.operation_area operationArea, s.status,b.building_name building,f.floor_name floor,m.`name` merchantName,m.id merchantId, - m.link_person linkPerson,m.link_phone linkPhone + m.link_person linkPerson,m.link_phone linkPhone,s.manager,s.manager_phone managerPhone from wx_shop s left join wx_merchant_shop ms on ms.shop_id=s.id and ms.is_del=0 left join wx_merchant m on ms.merchant_id=m.id left join wx_mall_building b on s.building=b.id @@ -212,8 +222,15 @@ and s.`update_date` = #{updateDate} - + + + and s.`manager` = #{manager} + + + and s.`manager_phone` = #{managerPhone} + + and s.id in @@ -250,7 +267,7 @@ select s.id,s.shop_number shopNumber,s.build_area buildArea, s.img_url imgUrl,s.operation_area operationArea, s.status,b.building_name building,f.floor_name floor,m.`name` merchantName,m.id merchantId, - m.link_person linkPerson,m.link_phone linkPhone + m.link_person linkPerson,m.link_phone linkPhone,s.manager,s.manager_phone managerPhone from wx_shop s left join wx_merchant_shop ms on ms.shop_id=s.id and ms.is_del=0 left join wx_merchant m on ms.merchant_id=m.id left join wx_mall_building b on s.building=b.id