|
|
|
@@ -340,7 +340,15 @@ public class WxRentContractController extends WxContractBaseController { |
|
|
|
contract.getApplyStatus().intValue() == EnumRentContractAppStatus.SETBACK.getCode().intValue()))) { |
|
|
|
contract.setStatus(EnumRentContractStatus.INVALID.getCode()); |
|
|
|
contract.setUpdatetime(new Date()); |
|
|
|
return wxRentContractService.updateRentContract(contract); |
|
|
|
wxRentContractService.updateRentContract(contract); |
|
|
|
|
|
|
|
if(contract.getOperationType().intValue() == EnumContractOperationType.WHOLE.getCode().intValue()) { |
|
|
|
WxPropertyContract propertyContract = wxPropertyContractService.getSimpleDetail(wxRentContract.getPropertyId()); |
|
|
|
propertyContract.setStatus(EnumRentContractStatus.INVALID.getCode()); |
|
|
|
propertyContract.setUpdatetime(new Date()); |
|
|
|
wxPropertyContractService.updatePropertyContract(propertyContract); |
|
|
|
} |
|
|
|
return new ResultData(); |
|
|
|
}else { |
|
|
|
return new ResultData(Result.ERROR, "合同状态不允许作废.只能作废草稿或者履约拒绝的合同。"); |
|
|
|
} |
|
|
|
@@ -358,6 +366,9 @@ public class WxRentContractController extends WxContractBaseController { |
|
|
|
logger.debug("[" + getIpAddr() + "] WxRentContractController::endContract"); |
|
|
|
wxRentContract.updateTenantInfo(getTenantInfo()); |
|
|
|
wxRentContractService.endContract(wxRentContract); |
|
|
|
if(wxRentContract.getOperationType().intValue() == EnumContractOperationType.WHOLE.getCode().intValue()) { |
|
|
|
wxPropertyContractService.updatePropertyContractStatus(wxRentContract.getPropertyId()); |
|
|
|
} |
|
|
|
return new ResultData(); |
|
|
|
} |
|
|
|
|
|
|
|
@@ -406,6 +417,9 @@ public class WxRentContractController extends WxContractBaseController { |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"店铺已经在其他计租中或者已签约未到期的合同里面了。"); |
|
|
|
} |
|
|
|
wxRentContractService.updateRentContractStatus(wxRentContract.getId()); |
|
|
|
if(contract.getOperationType().intValue() == EnumContractOperationType.WHOLE.getCode().intValue()) { |
|
|
|
wxPropertyContractService.updatePropertyContractStatus(wxRentContract.getPropertyId()); |
|
|
|
} |
|
|
|
return new ResultData(Result.SUCCESS,"合同生效成功!"); |
|
|
|
} |
|
|
|
|
|
|
|
|