| @@ -39,6 +39,14 @@ public class WxMerchantVo { | |||||
| @io.swagger.annotations.ApiModelProperty(value="楼层",name="floorName") | @io.swagger.annotations.ApiModelProperty(value="楼层",name="floorName") | ||||
| private String floorName; | private String floorName; | ||||
| @io.swagger.annotations.ApiModelProperty(value="楼座号",name="building") | |||||
| private Long building; | |||||
| @io.swagger.annotations.ApiModelProperty(value="楼层号",name="floor") | |||||
| private Long floor; | |||||
| @io.swagger.annotations.ApiModelProperty(value = "是否显示在C端", name = "show") | @io.swagger.annotations.ApiModelProperty(value = "是否显示在C端", name = "show") | ||||
| private Integer isPublic; | private Integer isPublic; | ||||
| @@ -332,6 +332,16 @@ | |||||
| select | select | ||||
| <include refid="allMerchantVoColumns"/> | <include refid="allMerchantVoColumns"/> | ||||
| FROM wx_merchant m | FROM wx_merchant m | ||||
| <if test=" null != building or null != floor "> | |||||
| join wx_merchant_shop ms on ms.merchant_id=m.id | |||||
| join wx_shop s on ms.shop_id=s.id | |||||
| <if test=" null != building"> | |||||
| and s.building = #{building} | |||||
| </if> | |||||
| <if test=" null != floor "> | |||||
| and s.floor = #{floor} | |||||
| </if> | |||||
| </if> | |||||
| left join wx_business bu on bu.id = m.business_id | left join wx_business bu on bu.id = m.business_id | ||||
| where 1=1 and m.is_del=0 | where 1=1 and m.is_del=0 | ||||
| <if test=" null != merchantName and ''!=merchantName "> | <if test=" null != merchantName and ''!=merchantName "> | ||||