diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java
index 12e2ffc63..363f1be7d 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java
@@ -214,4 +214,13 @@ public class WxBillRent extends TenantEntity {
return new BigDecimal(realReceivePay == null ? 0 : realReceivePay).divide(new BigDecimal(100)).toPlainString();
}
+
+ @io.swagger.annotations.ApiModelProperty(value="楼座号",name="building")
+ @TableField(exist = false)
+ private Long building;
+
+ @io.swagger.annotations.ApiModelProperty(value="楼层号",name="floor")
+ @TableField(exist = false)
+ private Long floor;
+
}
diff --git a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml
index 510fadeeb..4a08b6765 100644
--- a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml
@@ -133,6 +133,21 @@
and br.`late_pay_status` = #{latePayStatus}
and br.`receive_date` between #{starttime} and #{endtime}
+
+ and br.`merchant_id` in(
+ select ms.merchant_id from (select merchant_id,shop_id from wx_merchant_shop where is_del=0) ms
+ inner join wx_merchant m on ms.merchant_id = m.id
+ inner join wx_shop s on s.id=ms.shop_id
+ where s.is_del=0
+
+ and s.`building`= #{building}
+
+
+ and s.`floor` = #{floor}
+
+ )
+
+
order by ${sortColumns}