|
|
|
@@ -28,6 +28,7 @@ |
|
|
|
<result column="is_preview" property="isPreview"/> |
|
|
|
<result column="shop_info" jdbcType="VARCHAR" property="shopInfo"/> |
|
|
|
<result column="pay_way" jdbcType="INTEGER" property="payWay"/> |
|
|
|
<result column="late_pay_status" jdbcType="INTEGER" property="latePayStatus"/> |
|
|
|
|
|
|
|
</resultMap> |
|
|
|
|
|
|
|
@@ -36,7 +37,7 @@ |
|
|
|
`createtime`,`expired_day`,`tenant_id`,`owe`,`status`,`is_del`,`need_pay`, |
|
|
|
`merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`, |
|
|
|
`revenue`,`late_pay_ratio`,`late_pay_time`,`late_pay_price`,`period`,`is_preview`,`shop_info`, |
|
|
|
`pay_way` |
|
|
|
`pay_way`,`late_pay_status` |
|
|
|
</sql> |
|
|
|
|
|
|
|
<sql id="dynamicWhereConditions"> |
|
|
|
@@ -62,6 +63,7 @@ |
|
|
|
<if test=" null == isPreview ">and is_preview = 0</if> |
|
|
|
<if test=" null != isPreview ">and is_preview = #{isPreview}</if> |
|
|
|
<if test=" null != payWay ">and `pay_way` = #{payWay}</if> |
|
|
|
<if test=" null != latePayStatus ">and `late_pay_status` = #{latePayStatus}</if> |
|
|
|
|
|
|
|
<if test=" null != ids "> |
|
|
|
and id in |
|
|
|
@@ -89,7 +91,7 @@ |
|
|
|
br.`rent_contract_id` rentContractId,d.receive_pay deposit,case when br.late_pay_time is null then 0 else |
|
|
|
FLOOR(DATEDIFF(now(),br.late_pay_time)*br.late_pay_ratio/10000*br.owe) end latePayPrice, |
|
|
|
(select max(period) from wx_bill_rent where rent_contract_id=br.rent_contract_id) allPeriod,d.`status` |
|
|
|
depositStatus,br.shop_info shopInfo,br.pay_way payWay |
|
|
|
depositStatus,br.shop_info shopInfo,br.pay_way payWay,br.late_pay_status latePayStatus |
|
|
|
from wx_bill_rent br left join wx_merchant m on br.merchant_id=m.id |
|
|
|
left join wx_shop s on br.shop_id=s.id |
|
|
|
left join wx_rent_contract r on br.rent_contract_id=r.id |
|
|
|
@@ -106,6 +108,7 @@ |
|
|
|
<if test=" null != rentShopType ">and br.`rent_shop_type` = #{rentShopType}</if> |
|
|
|
<if test=" null != rentContractId ">and br.`rent_contract_id` = #{rentContractId}</if> |
|
|
|
<if test=" null != payWay ">and br.`pay_way` = #{payWay}</if> |
|
|
|
<if test=" null != latePayStatus ">and br.`late_pay_status` = #{latePayStatus}</if> |
|
|
|
|
|
|
|
</where> |
|
|
|
<if test=" null != sortColumns">order by br.${sortColumns}</if> |
|
|
|
|