diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java index a36a5dbac..48c2d8270 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -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(); } @@ -486,7 +493,23 @@ public class WxRentContractController extends WxContractBaseController { return new ResultData(wxRentContractService.getRentContractList(wxRentContract, pageNum, pageSize)); } - + @GetMapping("getPayAccountInfo") + @SystemControllerLog(description = "租赁合同-获取甲方账户") + public ResultData getPayAccountInfo() { + logger.debug("[" + getIpAddr() + "] WxRentContractController::updateRentContractStatus"); + WxPayAccountBill payAccountBill = payAccountBillService.getByTenantInfo(getTenantInfo()); + Map map = new HashMap<>(); + if(StringUtils.isNotBlank(payAccountBill.getBankAccountName()) && StringUtils.isNotBlank(payAccountBill.getBankCardId())) { + map.put("bankAccountName", payAccountBill.getBankAccountName()); + map.put("bankCardId", payAccountBill.getBankCardId()); + if(payAccountBill.getServiceChargeRate() == null){ + map.put("serviceChargeRate", "0"); + }else{ + map.put("serviceChargeRate", payAccountBill.getServiceChargeRate()+""); + } + } + return new ResultData(map); + } @@ -619,24 +642,6 @@ public class WxRentContractController extends WxContractBaseController { return wxRentContractService.updateRentContractStatus(wxRentContract.getId()); } - @GetMapping("getPayAccountInfo") - @SystemControllerLog(description = "租赁合同-获取甲方账户") - public ResultData getPayAccountInfo() { - logger.debug("[" + getIpAddr() + "] WxRentContractController::updateRentContractStatus"); - WxPayAccountBill payAccountBill = payAccountBillService.getByTenantInfo(getTenantInfo()); - Map map = new HashMap<>(); - if(StringUtils.isNotBlank(payAccountBill.getBankAccountName()) && StringUtils.isNotBlank(payAccountBill.getBankCardId())) { - map.put("bankAccountName", payAccountBill.getBankAccountName()); - map.put("bankCardId", payAccountBill.getBankCardId()); - if(payAccountBill.getServiceChargeRate() == null){ - map.put("serviceChargeRate", "0"); - }else{ - map.put("serviceChargeRate", payAccountBill.getServiceChargeRate()+""); - } - } - return new ResultData(map); - } - @PostMapping("savePayAccountInfo") @SystemControllerLog(description = "租赁合同-保存甲方账户") public ResultData savePayAccountInfo(@RequestBody WxPayAccountBill payAccountBill) { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java index 201cfa2e8..56af850fc 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -277,7 +277,7 @@ public class WxRentContract extends TenantEntity { int size = rentInfoArray.size(); for (int i = 0; i < size; i++) { JSONObject rentInfoObject = rentInfoArray.getJSONObject(i); - Long shopId = rentInfoObject.getLong("shopId"); + Long shopId = rentInfoObject.getLong("id"); shopList.add(shopId); } return shopList; 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 554912323..5ed628465 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/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(); - 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> list = wxShopMapper.findListMap(record); result.put("wxShops", list); }else { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java index 3ebdd3eb8..9621191d7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java @@ -72,19 +72,23 @@ public class WxRentPropertyContractServiceImpl implements WxRentPropertyContract @Override public ResultData getContractApplyInfo(Long rentId,Long propertyId) { Map data = new HashMap<>(2); - Map rent = wxRentContractService.getById(rentId); - data.put("rent", rent); + if (null != rentId) { + Map rent = wxRentContractService.getById(rentId); + data.put("rent", rent); + } // WxPropertyContract wxPropertyContractQuery = new WxPropertyContract(); // wxPropertyContractQuery.setRentContractId(id); // WxPropertyContract propertyContract = wxPropertyContractMapper.selectOne(new QueryWrapper(wxPropertyContractQuery)); - WxPropertyContract propertyContract = wxPropertyContractMapper.selectById(propertyId); - if (propertyContract != null) { - try { - Map property = wxPropertyContractService.getById(propertyContract.getId()); - data.put("property", property); - } catch (MallinkException e) { - logger.error(e.getMessage()); - } + if (null != propertyId) { + WxPropertyContract propertyContract = wxPropertyContractMapper.selectById(propertyId); + if (propertyContract != null) { + try { + Map property = wxPropertyContractService.getById(propertyContract.getId()); + data.put("property", property); + } catch (MallinkException e) { + logger.error(e.getMessage()); + } + } } return new ResultData(data); }