| @@ -7,6 +7,7 @@ import com.iformall.controller.base.BaseController; | |||||
| import com.iformall.domain.po.MallUserInfo; | import com.iformall.domain.po.MallUserInfo; | ||||
| import com.iformall.domain.po.WxBillProperty; | import com.iformall.domain.po.WxBillProperty; | ||||
| import com.iformall.domain.po.WxPropertyContract; | import com.iformall.domain.po.WxPropertyContract; | ||||
| import com.iformall.domain.po.WxRentContract; | |||||
| import com.iformall.enums.EnumFromType; | import com.iformall.enums.EnumFromType; | ||||
| import com.iformall.enums.EnumRentStartType; | import com.iformall.enums.EnumRentStartType; | ||||
| import com.iformall.mapper.WxPropertyContractMapper; | import com.iformall.mapper.WxPropertyContractMapper; | ||||
| @@ -172,5 +173,12 @@ public class WxPropertyContractController extends BaseController { | |||||
| return wxPropertyContractService.updatePropertyContractStatus(id); | return wxPropertyContractService.updatePropertyContractStatus(id); | ||||
| } | } | ||||
| @PostMapping("endContract") | |||||
| @SystemControllerLog(description = "物业合同-终止合同") | |||||
| public ResultData endContract(@RequestBody WxPropertyContract wxPropertyContract) { | |||||
| logger.debug("[" + getIpAddr() + "] WxRentContractController::endContract"); | |||||
| wxPropertyContractService.endContract(wxPropertyContract); | |||||
| return new ResultData(); | |||||
| } | |||||
| } | } | ||||
| @@ -5,6 +5,7 @@ import com.iformall.domain.po.WxBillProperty; | |||||
| import com.iformall.domain.po.WxBillRent; | import com.iformall.domain.po.WxBillRent; | ||||
| import com.iformall.domain.po.WxPropertyContract; | import com.iformall.domain.po.WxPropertyContract; | ||||
| import com.iformall.domain.po.WxRentContract; | import com.iformall.domain.po.WxRentContract; | ||||
| import org.springframework.web.bind.annotation.RequestBody; | |||||
| import javax.servlet.http.HttpServletRequest; | import javax.servlet.http.HttpServletRequest; | ||||
| import javax.servlet.http.HttpServletResponse; | import javax.servlet.http.HttpServletResponse; | ||||
| @@ -65,5 +66,5 @@ public interface WxPropertyContractService { | |||||
| ResultData updatePropertyContractStatus(Long id); | ResultData updatePropertyContractStatus(Long id); | ||||
| void endContract(WxPropertyContract wxPropertyContract); | |||||
| } | } | ||||
| @@ -187,9 +187,7 @@ public class WxFlowServiceImpl implements WxFlowService { | |||||
| wxPropertyContract.setStatus(EnumRentContractStatus.CONTRACT_TERMINATE.getCode()); | wxPropertyContract.setStatus(EnumRentContractStatus.CONTRACT_TERMINATE.getCode()); | ||||
| //账单失效 | //账单失效 | ||||
| WxBillProperty wxBillProperty = new WxBillProperty(); | |||||
| wxBillProperty.setPropertyContractId(businessId); | |||||
| wxBillPropertyMapper.updateInvalidStatus(wxBillProperty); | |||||
| wxPropertyContractService.endContract(wxPropertyContract); | |||||
| } | } | ||||
| wxPropertyContractMapper.updateApplyStatus(wxPropertyContract); | wxPropertyContractMapper.updateApplyStatus(wxPropertyContract); | ||||
| } | } | ||||
| @@ -931,6 +931,15 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||||
| } | } | ||||
| } | } | ||||
| @Override | |||||
| public void endContract(WxPropertyContract wxPropertyContract) { | |||||
| wxPropertyContract.setStatus(EnumRentContractStatus.CONTRACT_TERMINATE.getCode()); | |||||
| wxPropertyContractMapper.updateStatus(wxPropertyContract); | |||||
| WxBillProperty wxBillProperty = new WxBillProperty(); | |||||
| wxBillProperty.setPropertyContractId(wxPropertyContract.getId()); | |||||
| wxBillPropertyMapper.updateInvalidStatus(wxBillProperty); | |||||
| } | |||||
| } | } | ||||