Просмотр исходного кода

[租赁及物业账单][修改][明细]

release_toaliyun_real
gongbiao 7 лет назад
Родитель
Сommit
c1c2b9477d
4 измененных файлов: 5 добавлений и 4 удалений
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java
  3. +2
    -1
      mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml
  4. +1
    -1
      mallinkService/src/main/resources/mapper/WxBillRentMapper.xml

+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java Просмотреть файл

@@ -179,7 +179,7 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService {
Map<String, Object> property = getById(id);
//押金
WxBillPropertyDeposit depositParam = new WxBillPropertyDeposit();
depositParam.setPropertyContractId(id);
depositParam.setPropertyContractId((Long) property.get("propertyContractId"));
Map<String, Object> deposit = wxBillPropertyDepositMapper.queryBillDepositList(depositParam).get(0);
//周期
Object weekly = findByMerchantId((Long) property.get("merchantId"));


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java Просмотреть файл

@@ -178,7 +178,7 @@ public class WxBillRentServiceImpl implements WxBillRentService {
Map<String, Object> rent = getById(id);
//押金
WxBillDeposit depositParam = new WxBillDeposit();
depositParam.setRentContractId(id);
depositParam.setRentContractId((Long) rent.get("rentContractId"));
Map<String, Object> deposit = wxBillDepositMapper.queryBillDepositList(depositParam).get(0);
//周期
Object weekly = findByMerchantId((Long) rent.get("merchantId"));


+ 2
- 1
mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml Просмотреть файл

@@ -78,7 +78,8 @@
br.`need_pay` needPay,m.`name` merchantName,s.shop_number shopNumber,br.`updatetime`,
br.`merchant_id` merchantId,br.`rent_shop_type` rentShopType,br.`period`,
br.`revenue`,br.`late_pay_ratio` latePayRatio,br.`late_pay_time` latePayTime,
d.receive_pay deposit,case when br.late_pay_time is null then 0 else
br.`property_contract_id` propertyContractId,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_property where id=br.id) allPeriod,d.`status` depositStatus
from wx_bill_property br left join wx_merchant m on br.merchant_id=m.id


+ 1
- 1
mallinkService/src/main/resources/mapper/WxBillRentMapper.xml Просмотреть файл

@@ -79,7 +79,7 @@
br.`need_pay` needPay,m.`name` merchantName,s.shop_number shopNumber,br.`updatetime`,
br.`merchant_id` merchantId,br.`rent_shop_type` rentShopType,r.type rentType,r.pay_ratio payRatio,
br.`revenue`,br.`late_pay_ratio` latePayRatio,br.`late_pay_time` latePayTime,br.`period`,
d.receive_pay deposit,case when br.late_pay_time is null then 0 else
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 id=br.id) allPeriod,d.`status` depositStatus
from wx_bill_rent br left join wx_merchant m on br.merchant_id=m.id


Загрузка…
Отмена
Сохранить