|
|
|
@@ -520,8 +520,9 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
Long orginId = record.getOrginId(); |
|
|
|
if (record.isYingZiContract()){ |
|
|
|
isYingzi = true; |
|
|
|
wxRentContractMapper.deleteContract(record.getTenantId(),id); |
|
|
|
wxRentContractMapper.updateContractId(record.getTenantId(), id, record.getOrginId()); |
|
|
|
wxRentContractMapper.copyValidDeleteContract(record.getTenantId(), orginId); |
|
|
|
wxRentContractMapper.deleteContract(record.getTenantId(),orginId); |
|
|
|
wxRentContractMapper.updateContractId(record.getTenantId(), id, orginId); |
|
|
|
record.setId(orginId); |
|
|
|
} |
|
|
|
|
|
|
|
@@ -553,13 +554,13 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
|
|
|
|
//影子合同处理,源合同账单则需要清空当前时间之后未处理的账单 |
|
|
|
if (isYingzi) { |
|
|
|
//当前时间之后的未处理过的账单,全部删除,之前的账单,还有以后已经处理过的账单,不处理。需财务手工处理这些账单 |
|
|
|
//原合同账单处理:当前时间之后的未处理过的账单,全部删除,之前的账单,还有以后已经处理过的账单,不处理。需财务手工处理这些账单 |
|
|
|
WxAllBill bq = new WxAllBill(); |
|
|
|
bq.updateTenantInfo(wxRentContract); |
|
|
|
bq.setRentContractId(orginId); |
|
|
|
bq.setShopEndtime(record.getRentalStartDate()); |
|
|
|
wxAllBillMapper.deleteNoNeedPayBill(bq); |
|
|
|
//把原账单的合同编号更改为源合同ID |
|
|
|
//新合同的账单:把账单的合同编号更改为源合同ID |
|
|
|
wxAllBillMapper.updateContractId(id, orginId, wxRentContract.getTenantId()); |
|
|
|
} |
|
|
|
|
|
|
|
|