diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java index f48e43427..a005bf9d8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java @@ -7,6 +7,7 @@ import com.iformall.controller.base.BaseController; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxBillProperty; import com.iformall.domain.po.WxPropertyContract; +import com.iformall.domain.po.WxRentContract; import com.iformall.enums.EnumFromType; import com.iformall.enums.EnumRentStartType; import com.iformall.mapper.WxPropertyContractMapper; @@ -172,5 +173,12 @@ public class WxPropertyContractController extends BaseController { 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(); + } } diff --git a/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java b/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java index 2dcb846d7..8fd82f850 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java @@ -5,6 +5,7 @@ import com.iformall.domain.po.WxBillProperty; import com.iformall.domain.po.WxBillRent; import com.iformall.domain.po.WxPropertyContract; import com.iformall.domain.po.WxRentContract; +import org.springframework.web.bind.annotation.RequestBody; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -65,5 +66,5 @@ public interface WxPropertyContractService { ResultData updatePropertyContractStatus(Long id); - + void endContract(WxPropertyContract wxPropertyContract); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index 111ea1364..1dd95d38a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -187,9 +187,7 @@ public class WxFlowServiceImpl implements WxFlowService { wxPropertyContract.setStatus(EnumRentContractStatus.CONTRACT_TERMINATE.getCode()); //账单失效 - WxBillProperty wxBillProperty = new WxBillProperty(); - wxBillProperty.setPropertyContractId(businessId); - wxBillPropertyMapper.updateInvalidStatus(wxBillProperty); + wxPropertyContractService.endContract(wxPropertyContract); } wxPropertyContractMapper.updateApplyStatus(wxPropertyContract); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index fbf0aa513..a7526afd6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -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); + } }