|
|
|
@@ -1461,8 +1461,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
if (record != null && |
|
|
|
record.getMerchantId() != null && |
|
|
|
record.getReceivePeriod() != null && |
|
|
|
record.getPrice() > 0 && |
|
|
|
record.getDeposit() > 0) { |
|
|
|
record.getPrice() > 0 ) { |
|
|
|
//预览账单改为正式,并写入商户id |
|
|
|
WxBillRent billRent = new WxBillRent(); |
|
|
|
billRent.setRentContractId(id); |
|
|
|
@@ -1472,9 +1471,11 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
WxMerchant wxMerchant = new WxMerchant(); |
|
|
|
wxMerchant.setId(record.getMerchantId()); |
|
|
|
wxMerchant.setTenantId(record.getTenantId()); |
|
|
|
//押金 |
|
|
|
buildDeposit(wxMerchant, null,id); |
|
|
|
updatePropertyPreviewBill(record); |
|
|
|
if(record.getDeposit() > 0) { |
|
|
|
//押金 |
|
|
|
buildDeposit(wxMerchant, null, id); |
|
|
|
updatePropertyPreviewBill(record); |
|
|
|
} |
|
|
|
//作废合同 |
|
|
|
updateInvalidContract(id); |
|
|
|
} |
|
|
|
|