|
|
|
@@ -223,6 +223,13 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService |
|
|
|
logger.error("保存物业合同信息失败,e:" + e.getMessage()); |
|
|
|
throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); |
|
|
|
} |
|
|
|
|
|
|
|
//生成预览账单 |
|
|
|
wxBillPropertyMapper.deletePreviewBill(record); |
|
|
|
//重新生成 |
|
|
|
List<WxBillProperty> billList = buildProperty(new WxMerchant(),record,EnumIsPreview.YES.getCode()); |
|
|
|
propertyContract.setPreviewBillRentList(billList); |
|
|
|
|
|
|
|
message = "保存物业合同信息成功"; |
|
|
|
} else {//更新物业合同信息 |
|
|
|
WxPropertyContract wxPropertyContract = wxPropertyContractMapper.selectByPrimaryKey(record.getId()); |
|
|
|
@@ -253,6 +260,20 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService |
|
|
|
logger.error("更新物业合同信息失败,e:" + e.getMessage()); |
|
|
|
throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); |
|
|
|
} |
|
|
|
|
|
|
|
//生成预览账单 |
|
|
|
if(!wxPropertyContract.getReceivePeriod().equals(record.getReceivePeriod()) |
|
|
|
||!wxPropertyContract.getPrice().equals(record.getPrice()) |
|
|
|
||!wxPropertyContract.getDeposit().equals(record.getDeposit())){ |
|
|
|
wxBillPropertyMapper.deletePreviewBill(record); |
|
|
|
//重新生成 |
|
|
|
wxPropertyContract.setPrice(record.getPrice()); |
|
|
|
wxPropertyContract.setDeposit(record.getDeposit()); |
|
|
|
wxPropertyContract.setReceivePeriod(record.getReceivePeriod()); |
|
|
|
wxPropertyContract.setPayAccount(record.getPayAccount()); |
|
|
|
List<WxBillProperty> billList = buildProperty(new WxMerchant(),wxPropertyContract,EnumIsPreview.YES.getCode()); |
|
|
|
record.setPreviewBillRentList(billList); |
|
|
|
} |
|
|
|
message = "更新物业合同信息成功"; |
|
|
|
} |
|
|
|
|
|
|
|
@@ -734,25 +755,4 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public List<WxBillProperty> buildBill(WxPropertyContract wxPropertyContract) { |
|
|
|
//生成预览账单 |
|
|
|
//根据租赁合同找到对应的物业合同,生成物业账单 |
|
|
|
WxPropertyContract propertyContract = wxPropertyContractMapper.selectByPrimaryKey(wxPropertyContract.getId()); |
|
|
|
if(propertyContract != null) { |
|
|
|
if(!wxPropertyContract.getReceivePeriod().equals(propertyContract.getReceivePeriod()) |
|
|
|
||!wxPropertyContract.getPrice().equals(propertyContract.getPrice()) |
|
|
|
||!wxPropertyContract.getDeposit().equals(propertyContract.getDeposit())){ |
|
|
|
wxBillPropertyMapper.deletePreviewBill(propertyContract); |
|
|
|
//重新生成 |
|
|
|
propertyContract.setPrice(wxPropertyContract.getPrice()); |
|
|
|
propertyContract.setDeposit(wxPropertyContract.getDeposit()); |
|
|
|
propertyContract.setReceivePeriod(wxPropertyContract.getReceivePeriod()); |
|
|
|
propertyContract.setPayAccount(wxPropertyContract.getPayAccount()); |
|
|
|
List<WxBillProperty> billList = buildProperty(new WxMerchant(),propertyContract,EnumIsPreview.YES.getCode()); |
|
|
|
return billList; |
|
|
|
} |
|
|
|
} |
|
|
|
return new ArrayList<>(); |
|
|
|
} |
|
|
|
} |