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

Merge commit 'da2dd667a7c2c7b3f915b8d1f94a01cd58692af0' into release

release_toaliyun_real
luozukai 6 лет назад
Родитель
Сommit
239e9430bc
2 измененных файлов: 8 добавлений и 4 удалений
  1. +4
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java
  2. +4
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

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

@@ -221,15 +221,17 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
int count = 1;
for (WxBillProperty bill:record.getPreviewBillRentList()) {
bill.setId(idWorker.nextId());
Date date = new Date();
bill.setPropertyContractId(record.getId());
bill.setCreatetime(new Date());
bill.setCreatetime(date);
bill.setTenantId(record.getTenantId());
if (bill.getReceivePay().equals(0L)) {
bill.setStatus(EnumBillRentStatus.PAID.getCode());
bill.setPayDate(date);
}
bill.setOwe(bill.getReceivePay());
bill.setNeedPay(bill.getNeedPay());
bill.setUpdatetime(new Date());
bill.setUpdatetime(date);
bill.setRentShopType(record.getRentShopType());
bill.setPeriod(count);
bill.setIsPreview(EnumIsPreview.YES.getCode());


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

@@ -455,15 +455,17 @@ public class WxRentContractServiceImpl implements WxRentContractService {
int count = 1;
for (WxBillRent bill:record.getPreviewBillRentList()) {
bill.setId(idWorker.nextId());
Date date = new Date();
bill.setRentContractId(record.getId());
bill.setCreatetime(new Date());
bill.setCreatetime(date);
bill.setTenantId(record.getTenantId());
if (bill.getReceivePay().equals(0L)) {
bill.setStatus(EnumBillRentStatus.PAID.getCode());
bill.setPayDate(date);
}
bill.setOwe(bill.getReceivePay());
bill.setNeedPay(bill.getNeedPay());
bill.setUpdatetime(new Date());
bill.setUpdatetime(date);
bill.setRentShopType(record.getRentShopType());
bill.setPeriod(count);
bill.setIsPreview(EnumIsPreview.YES.getCode());


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