| @@ -386,25 +386,21 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||||
| throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); | throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); | ||||
| } | } | ||||
| record.setFeeStandards(record.getFeesStardarsList()); | record.setFeeStandards(record.getFeesStardarsList()); | ||||
| record.setLease(wxPropertyContract.getLease()); | |||||
| //更新物业合同信息 | //更新物业合同信息 | ||||
| if (record.getReceivePeriod() != null && record.getLease() != null && record.getPrice() != null | if (record.getReceivePeriod() != null && record.getLease() != null && record.getPrice() != null | ||||
| && !record.getReceivePeriod().equals(0) && !record.getLease().equals(0) && !record.getPrice().equals("0")) { | && !record.getReceivePeriod().equals(0) && !record.getLease().equals(0) && !record.getPrice().equals("0")) { | ||||
| //删除预账单,重新生成 | //删除预账单,重新生成 | ||||
| wxBillPropertyMapper.deleteBillByContract(record); | wxBillPropertyMapper.deleteBillByContract(record); | ||||
| //重新生成 | //重新生成 | ||||
| WxPropertyContract propertyContract = wxPropertyContractMapper.selectById(wxPropertyContract.getId()); | |||||
| if (null == propertyContract) { | |||||
| return new ResultData(Result.ERROR,"id无效"); | |||||
| } | |||||
| record.setRentalStartDate(propertyContract.getRentalStartDate()); | |||||
| record.setRentalEndDate(propertyContract.getRentalEndDate()); | |||||
| record.setRentStartType(propertyContract.getRentStartType()); | |||||
| record.setStartDate(propertyContract.getStartDate()); | |||||
| record.setAdjustPeriod(propertyContract.getAdjustPeriod()); | |||||
| record.setCreateType(propertyContract.getCreateType()); | |||||
| record.setShopIds(propertyContract.getShopIds()); | |||||
| record.setFeeStandards(propertyContract.getFeesStardarsList()); | |||||
| record.setRentalStartDate(wxPropertyContract.getRentalStartDate()); | |||||
| record.setRentalEndDate(wxPropertyContract.getRentalEndDate()); | |||||
| record.setRentStartType(wxPropertyContract.getRentStartType()); | |||||
| record.setStartDate(wxPropertyContract.getStartDate()); | |||||
| record.setAdjustPeriod(wxPropertyContract.getAdjustPeriod()); | |||||
| record.setCreateType(wxPropertyContract.getCreateType()); | |||||
| record.setShopIds(wxPropertyContract.getShopIds()); | |||||
| record.setFeeStandards(wxPropertyContract.getFeesStardarsList()); | |||||
| List<WxBillProperty> billList = buildProperty(new WxMerchant(),userId,record,EnumIsPreview.YES.getCode(),true); | List<WxBillProperty> billList = buildProperty(new WxMerchant(),userId,record,EnumIsPreview.YES.getCode(),true); | ||||
| record.setPreviewBillRentList(billList); | record.setPreviewBillRentList(billList); | ||||
| } | } | ||||