|
|
@@ -583,6 +583,46 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
wxRentContract.setRevenueJumps(wxRentContractRevenueJumpMapper.findList(jq));
|
|
|
wxRentContract.setRevenueJumps(wxRentContractRevenueJumpMapper.findList(jq));
|
|
|
return new ResultData(wxRentContract);
|
|
|
return new ResultData(wxRentContract);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
|
public ResultData updateRentStartTime(WxRentContract record, MallUserInfo user) {
|
|
|
|
|
|
//查询预账单用于展示
|
|
|
|
|
|
WxAllBill wxBillRent = new WxAllBill();
|
|
|
|
|
|
wxBillRent.setRentContractId(record.getId());
|
|
|
|
|
|
wxBillRent.setIsPreview(EnumIsPreview.YES.getCode());
|
|
|
|
|
|
wxBillRent.updateTenantInfo(record);
|
|
|
|
|
|
List<WxAllBill> resultList = wxAllBillMapper.findList(wxBillRent);
|
|
|
|
|
|
|
|
|
|
|
|
//更新
|
|
|
|
|
|
WxRentContract contractUpdate = new WxRentContract();
|
|
|
|
|
|
contractUpdate.setId(record.getId());
|
|
|
|
|
|
contractUpdate.updateTenantInfo(record);
|
|
|
|
|
|
contractUpdate.setRentStartType(record.getRentStartType());
|
|
|
|
|
|
contractUpdate.setUpdatetime(new Date());
|
|
|
|
|
|
contractUpdate.setUpdateBy(user.getId());
|
|
|
|
|
|
contractUpdate.setUpdateByName(user.getName());
|
|
|
|
|
|
wxRentContractMapper.updateById(record);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
WxRentContract rentContract = wxRentContractMapper.selectById(record.getId());
|
|
|
|
|
|
Date oldDate = record.getRentalStartDate();
|
|
|
|
|
|
rentContract.setAdjustPeriodHandle();
|
|
|
|
|
|
if(rentContract.getRentStartType()!=null && rentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){
|
|
|
|
|
|
rentContract.setRentalStartDate(rentContract.getStartDate());
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
deletePrewBill(record);
|
|
|
|
|
|
resultList = buildRent(user, record, EnumIsPreview.YES.getCode(),true);
|
|
|
|
|
|
savePreviewBill(record,user);
|
|
|
|
|
|
//保存商业管理费账单
|
|
|
|
|
|
savePreviewManageFeeBill(record,user,EnumRentContractManageFeeType.RENT_BUSSINESS_MANAGE_FEE);
|
|
|
|
|
|
//保存营业管理费账单
|
|
|
|
|
|
savePreviewManageFeeBill(record,user,EnumRentContractManageFeeType.RENT_OPERATING_MANAGE_FEE);
|
|
|
|
|
|
|
|
|
|
|
|
rentContract.setPreviewBillRentList(resultList);
|
|
|
|
|
|
rentContract.setRentalStartDate(oldDate);
|
|
|
|
|
|
return new ResultData(rentContract);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
/**
|
|
|
/**
|
|
|
* 重新生成账单(预账单调整)
|
|
|
* 重新生成账单(预账单调整)
|
|
|
|