|
|
@@ -276,6 +276,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
wxBillRent.setRentContractId(id);
|
|
|
wxBillRent.setRentContractId(id);
|
|
|
wxBillRent.setSortColumns("starttime asc");
|
|
|
wxBillRent.setSortColumns("starttime asc");
|
|
|
wxBillRent.updateTenantInfo(wxRentContract);
|
|
|
wxBillRent.updateTenantInfo(wxRentContract);
|
|
|
|
|
|
wxBillRent.setBillType(EnumBillAllType.RENT.getCode());
|
|
|
List<WxAllBill> resultList = wxAllBillMapper.findList(wxBillRent);
|
|
|
List<WxAllBill> resultList = wxAllBillMapper.findList(wxBillRent);
|
|
|
result.put("previewBillRentList",resultList);
|
|
|
result.put("previewBillRentList",resultList);
|
|
|
|
|
|
|
|
|
@@ -2042,11 +2043,11 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
// wxMerchant.updateTenantInfo(record);
|
|
|
// wxMerchant.updateTenantInfo(record);
|
|
|
|
|
|
|
|
|
//商业管理费,营业管理费
|
|
|
//商业管理费,营业管理费
|
|
|
WxAllBill billRentManage = new WxAllBill();
|
|
|
|
|
|
billRentManage.setRentContractId(id);
|
|
|
|
|
|
billRentManage.setIsPreview(EnumIsPreview.NO.getCode());
|
|
|
|
|
|
billRentManage.updateTenantInfo(record);
|
|
|
|
|
|
wxAllBillMapper.updatePreviewStatus(billRentManage);
|
|
|
|
|
|
|
|
|
//WxAllBill billRentManage = new WxAllBill();
|
|
|
|
|
|
//billRentManage.setRentContractId(id);
|
|
|
|
|
|
//billRentManage.setIsPreview(EnumIsPreview.NO.getCode());
|
|
|
|
|
|
//billRentManage.updateTenantInfo(record);
|
|
|
|
|
|
//wxAllBillMapper.updatePreviewStatus(billRentManage);
|
|
|
|
|
|
|
|
|
if(new BigDecimal(record.getDeposit()).compareTo(new BigDecimal(0)) > 0) {
|
|
|
if(new BigDecimal(record.getDeposit()).compareTo(new BigDecimal(0)) > 0) {
|
|
|
//押金
|
|
|
//押金
|
|
|
|