From da0fd22476d97df57da4d721d9a9e6adb744cf27 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 15 Jul 2019 15:07:53 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=BA=97=E9=93=BA][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E5=8F=82=E8=80=83=E7=A7=9F=E9=87=91=E5=AD=97=E6=AE=B5=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/WxShopMapper.xml | 49 ++++++++----------- 1 file changed, 21 insertions(+), 28 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxShopMapper.xml b/mallinkService/src/main/resources/mapper/WxShopMapper.xml index 9a254b3f2..789d1103e 100644 --- a/mallinkService/src/main/resources/mapper/WxShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxShopMapper.xml @@ -153,21 +153,31 @@ s.img_url imgUrl,CONVERT(s.operation_area,DECIMAL(10,2)) 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,s.manager,s.manager_phone managerPhone, - s.type,s.point_type pointType,s.addr,DATEDIFF(now(),s.create_date) freeDay + s.type,s.point_type pointType,s.addr,DATEDIFF(now(),s.create_date) freeDay,rent 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 left join wx_mall_floor f on s.floor=f.id where s.is_del=0 - - + + + and s.`type` = #{type} + + + + and s.`status` = #{status} + + + + and s.`building`= #{building} + + + + and s.`floor` = #{floor} + + + and s.`id` = #{id} - - - - - and s.`tenant_id`= #{tenantId} - @@ -185,21 +195,6 @@ - - and s.`building`= #{building} - - - - - and s.`floor` = #{floor} - - - - - and s.`status` = #{status} - - - and s.`x` = #{x} @@ -245,10 +240,8 @@ and s.`manager_phone` = #{managerPhone} - - and s.`type` = #{type} - - + + and s.`point_type` = #{pointType}