Browse Source

fix contract

release_toaliyun_real
xiaohanzi 5 years ago
parent
commit
faea00a3bd
2 changed files with 14 additions and 6 deletions
  1. +10
    -3
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java
  2. +4
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java

+ 10
- 3
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java View File

@@ -366,10 +366,17 @@ public class WxRentContractController extends WxContractBaseController {
@SystemControllerLog(description = "租赁合同-终止合同")
public ResultData endContract(@RequestBody WxRentContract wxRentContract) {
logger.debug("[" + getIpAddr() + "] WxRentContractController::endContract");
wxRentContract.updateTenantInfo(getTenantInfo());
WxRentContract contract = wxRentContractMapper.selectById(wxRentContract.getId());
if (contract == null) {
return new ResultData(ErrorCode.RENT_CONTRACT_IS_NOT_FOUND);
}
wxRentContract.updateTenantInfo(contract);
wxRentContractService.endContract(wxRentContract);
if(wxRentContract.getOperationType().intValue() == EnumContractOperationType.WHOLE.getCode().intValue()) {
wxPropertyContractService.updatePropertyContractStatus(wxRentContract.getPropertyId());
//租金+物业的终止
if(contract.getOperationType().intValue() == EnumContractOperationType.WHOLE.getCode().intValue()) {
WxPropertyContract wpc = new WxPropertyContract();
wpc.setId(wxRentContract.getPropertyId());
wxPropertyContractService.endContract(wpc);
}
return new ResultData();
}


+ 4
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java View File

@@ -179,10 +179,11 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
}
//关联的店铺
if (wxRentContract != null) {
WxRentContract wrc = wxRentContractMapper.selectById(wxPropertyContract.getRentContractId());
if (wrc != null) {
WxShop record = new WxShop();
if (null != wxRentContract.shopIdsByRentInfo() && wxRentContract.shopIdsByRentInfo().size()>0) {
record.setIds(wxRentContract.shopIdsByRentInfo());
if (null != wrc.shopIdsByRentInfo() && wrc.shopIdsByRentInfo().size()>0) {
record.setIds(wrc.shopIdsByRentInfo());
List<Map<String, Object>> list = wxShopMapper.findListMap(record);
result.put("wxShops", list);
}else {


Loading…
Cancel
Save