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

[合同][修改][编辑生成预账单]

release_toaliyun_real
gongbiao 7 лет назад
Родитель
Сommit
bfe530795f
2 измененных файлов: 18 добавлений и 9 удалений
  1. +10
    -7
      mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java
  2. +8
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

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

@@ -290,13 +290,16 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
record.setPreviewBillRentList(billList);

//生成预览账单
if(CollectionUtils.isEmpty(billList) ||
(!wxPropertyContract.getReceivePeriod().equals(record.getReceivePeriod())
||!wxPropertyContract.getPrice().equals(record.getPrice())
||!wxPropertyContract.getDeposit().equals(record.getDeposit())
||!wxPropertyContract.getAdjustPeriod().equals(record.getAdjustPeriod())
|| !DateUtils.date2String(wxPropertyContract.getRentalStartDate(),"yyyy-MM-dd").equals(DateUtils.date2String(record.getRentalStartDate(),"yyyy-MM-dd"))
)){
// if(CollectionUtils.isEmpty(billList) ||
// (!wxPropertyContract.getReceivePeriod().equals(record.getReceivePeriod())
// ||!wxPropertyContract.getPrice().equals(record.getPrice())
// ||!wxPropertyContract.getDeposit().equals(record.getDeposit())
// ||!wxPropertyContract.getAdjustPeriod().equals(record.getAdjustPeriod())
// || !DateUtils.date2String(wxPropertyContract.getRentalStartDate(),"yyyy-MM-dd").equals(DateUtils.date2String(record.getRentalStartDate(),"yyyy-MM-dd"))
// )){
if (record.getReceivePeriod() != null && record.getLease() != null && record.getPrice() != null
&& !record.getReceivePeriod().equals(0) && !record.getLease().equals(0) && !record.getPrice().equals(0)) {
//删除预账单,重新生成
wxBillPropertyMapper.deletePreviewBill(record);
//重新生成
wxPropertyContract.setPrice(record.getPrice());


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

@@ -344,7 +344,13 @@ public class WxRentContractServiceImpl implements WxRentContractService {
return resultData;
}

//有改变,删除预账单,重新生成
if (record.getReceivePeriod() != null && record.getLease() != null && record.getPrice() != null
&& !record.getReceivePeriod().equals(0) && !record.getLease().equals(0) && !record.getPrice().equals(0)) {
//删除预账单,重新生成
wxBillRentMapper.deletePreviewBill(record);
resultList = buildRent(new WxMerchant(), null, record, EnumIsPreview.YES.getCode());
}
/* //有改变,删除预账单,重新生成
if (record.getReceivePeriod() != null && record.getLease() != null && record.getPrice() != null
&& !record.getReceivePeriod().equals(0) && !record.getLease().equals(0) && !record.getPrice().equals(0)) {
boolean change = false;
@@ -389,7 +395,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
wxBillRentMapper.deletePreviewBill(record);
resultList = buildRent(new WxMerchant(), null, record, EnumIsPreview.YES.getCode());
}
}
}*/

//启动审批流
if(record.getFlowParams() != null){


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