Browse Source

rent

release_toaliyun_real
xhxu 5 years ago
parent
commit
f24e05221a
2 changed files with 7 additions and 2 deletions
  1. +6
    -0
      mallinkAdmin/src/main/resources/db/migration/V202103190001__wx_bill_rent.sql
  2. +1
    -2
      mallinkService/src/main/resources/mapper/WxBillRentMapper.xml

+ 6
- 0
mallinkAdmin/src/main/resources/db/migration/V202103190001__wx_bill_rent.sql View File

@@ -5,6 +5,12 @@ ADD COLUMN `contract_need_pay` bigint(12) COMMENT '原合同应收金额' AFTER
ADD COLUMN `rent_price_info` json COMMENT '合同应收明细' AFTER `contract_need_pay`;


update wx_bill_rent set
contract_need_pay = need_pay,
rent_price_info = concat('{"rentPrice": "',need_pay,'", "siteMoney": "0", "facilityMoney": "0", "administratorMoney": "0"}'),
where contract_need_pay is null;







+ 1
- 2
mallinkService/src/main/resources/mapper/WxBillRentMapper.xml View File

@@ -109,13 +109,12 @@
<select id="queryBillRentList" parameterType="com.iformall.domain.po.WxBillRent" resultMap="BaseResultMap">
select br.`id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day`,
case when br.status=1 then br.owe else 0 end owe,br.`status`,br.`contract_need_pay`,br.`rent_price_info`,br.`need_pay`,r.merchant_name,
s.shop_number,br.`updatetime`,br.`merchant_id`,br.`rent_shop_type`,r.type as rent_type,
br.`updatetime`,br.`merchant_id`,br.`rent_shop_type`,r.type as rent_type,
r.pay_ratio,br.`revenue`,r.`late_pay_ratio`,br.`late_pay_time`,br.`period`,br.`rent_contract_id`,
d.receive_pay deposit,d.`status`
deposit_status,br.late_pay_price,br.shop_info,br.pay_way,br.late_pay_status,br.`comments`,br.starttime,br.endtime,
r.late_pay_day,r.late_pay_ratio,br.bus_discount_ratio,br.freeze,br.join_rent_price,br.service_charge_pay
from wx_bill_rent br
left join wx_shop s on br.shop_id=s.id
left join wx_rent_contract r on br.rent_contract_id=r.id
left join wx_bill_rent_deposit d on br.rent_contract_id=d.rent_contract_id and br.merchant_id=d.merchant_id
<where>


Loading…
Cancel
Save