|
|
|
@@ -46,7 +46,7 @@ |
|
|
|
</select> |
|
|
|
|
|
|
|
<select id="findBySettleId" parameterType="com.iformall.domain.po.WxBillSettleBill" resultMap="BaseResultMap"> |
|
|
|
select bill.starttime,bill.endtime,bl.bill_id,bl.bill_type,bill.bill_type billName,IFNULL(bill.receive_pay,0) receivePay from wx_bill_settle_bill bl left join |
|
|
|
select bill.starttime,bill.endtime,bl.bill_id,bl.bill_type,bill.bill_type billName,IFNULL(bill.owe,0) receivePay from wx_bill_settle_bill bl left join |
|
|
|
(select id,merchant_id,shop_id,tenant_id,1 bill_type_value,'租金-租金' |
|
|
|
bill_type,need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,rent_shop_type,starttime,endtime from wx_bill_rent where is_preview = 0 |
|
|
|
union all |
|
|
|
|