|
|
|
@@ -642,7 +642,7 @@ |
|
|
|
</select> |
|
|
|
|
|
|
|
<select id="getReceiveAndPayBillAsPage" parameterType="com.iformall.domain.vo.WxBillAll" resultType="hashmap"> |
|
|
|
select m.id,m.name,ws.shop_number shopNumber,ws.type,m.link_person linkPerson,m.link_line_phone linkPhone, |
|
|
|
select m.id,m.name,ws.shop_number shopNumber,ws.type,m.link_person linkPerson,m.link_line_phone linkPhone,xb.title business,rc.rental_start_date,rc.rental_end_date, |
|
|
|
|
|
|
|
round( |
|
|
|
(select sum(bill.receive_pay) from ( |
|
|
|
@@ -731,8 +731,11 @@ |
|
|
|
)/100,2)) balance |
|
|
|
|
|
|
|
from wx_merchant m left join wx_merchant_shop wms on wms.merchant_id = m.id left join wx_shop ws on wms.shop_id = ws.id |
|
|
|
left join wx_business xb on(m.business_id = xb.id) |
|
|
|
left join wx_rent_contract rc on(rc.merchant_id = m.id) |
|
|
|
where 1=1 |
|
|
|
<if test=" null != tenantId"> and m.tenant_id = #{tenantId} </if> |
|
|
|
<if test=" null != merchantId"> and m.id = #{merchantId} </if> |
|
|
|
<if test=" null != merchantName"> and m.name like concat('%', #{merchantName},'%') </if> |
|
|
|
|
|
|
|
<if test=" null != sortColumns"> order by ${sortColumns} </if> |
|
|
|
@@ -741,4 +744,6 @@ |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
</mapper> |