diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index db00ef2ea..a3be9248c 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -46,7 +46,7 @@ `tenant_id`,`filepath`,`status`,`contract_number`,`deposit`,`pay_date`,`is_del`,`merchant_name`, `brand`,`business_id`,`shop_type`,`shop_id`,`updatetime`,`createtime`,`link_person`,`link_phone`, `pay_account`,`filename`,`lease`,`type`,`revenue`,`adjust_ratio`,`adjust_period`,`pay_ratio`, - `start_date`,`end_date`,`apply_status`,`bank_name`,'rent_shop_type' + `start_date`,`end_date`,`apply_status`,`bank_name`,`rent_shop_type` @@ -80,7 +80,7 @@ and `type` = #{type} and `start_date` = #{startDate} and `end_date` = #{endDate} - + and `rent_shop_type` = #{rentShopType} and id in diff --git a/mallinkService/src/main/resources/mapper/WxShopMapper.xml b/mallinkService/src/main/resources/mapper/WxShopMapper.xml index 35978225a..878fe83d8 100644 --- a/mallinkService/src/main/resources/mapper/WxShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxShopMapper.xml @@ -151,7 +151,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,s.manager,s.manager_phone managerPhone + m.link_person linkPerson,m.link_phone linkPhone,s.manager,s.manager_phone managerPhone, s.type,s.point_type pointType 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