Просмотр исходного кода

fix contract

release_toaliyun_real
xiaohanzi 5 лет назад
Родитель
Сommit
faea00a3bd
2 измененных файлов: 14 добавлений и 6 удалений
  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 Просмотреть файл

@@ -366,10 +366,17 @@ public class WxRentContractController extends WxContractBaseController {
@SystemControllerLog(description = "租赁合同-终止合同") @SystemControllerLog(description = "租赁合同-终止合同")
public ResultData endContract(@RequestBody WxRentContract wxRentContract) { public ResultData endContract(@RequestBody WxRentContract wxRentContract) {
logger.debug("[" + getIpAddr() + "] WxRentContractController::endContract"); 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); 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(); return new ResultData();
} }


+ 4
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java Просмотреть файл

@@ -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(); 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); List<Map<String, Object>> list = wxShopMapper.findListMap(record);
result.put("wxShops", list); result.put("wxShops", list);
}else { }else {


Загрузка…
Отмена
Сохранить