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 c58ffc0ce..138ea289e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java @@ -251,24 +251,6 @@ public class WxPropertyContractController extends WxContractBaseController { MallUserInfo user = getUser(); wxPropertyContract.updateTenantInfo(user); wxPropertyContract.setAdjustPeriodHandle(); - if (null == wxPropertyContract.getCreateType()) { - wxPropertyContract.setCreateType(EnumPropertyCreateType.BY_RENT.getCode().intValue()); - } - if (wxPropertyContract.getCreateType().intValue() == EnumPropertyCreateType.BY_SHOP.getCode().intValue()) { - if (StringUtils.isBlank(wxPropertyContract.getRentArea()) || StringUtils.isBlank(wxPropertyContract.getShopIds())) { - return new ResultData("rentArea,shopIds参数不能为空"); - } - wxPropertyContract.setShopIds(","+wxPropertyContract.getShopIds()+","); - wxPropertyContract.calcutePrice(wxPropertyContract.getRentArea()); - }else { - WxRentContract rentContract = rentContractService.getSimpleDeatil(wxPropertyContract.getRentContractId()); - wxPropertyContract.calcutePrice(rentContract.getRentArea()); - } - Integer contractType = wxRentPropertyContractService.getContractType(wxPropertyContract.getRentShopType(), wxPropertyContract.getOperationType(), EnumContractType.PROPERTY.getCode()); - wxPropertyContract.setContractType(contractType); - if(wxPropertyContract.getRentStartType()!=null && wxPropertyContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ - wxPropertyContract.setRentalStartDate(wxPropertyContract.getStartDate()); - } if (null != wxPropertyContract.getFeeStandards() && wxPropertyContract.getFeeStandards().size() > 0 ) { wxPropertyContract.setFeesStandardsInfo(JSON.toJSONString(wxPropertyContract.getFeeStandards())); } 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 d3c26632e..e21e776b3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -254,7 +254,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService wxBillRent.setSortColumns(BaseEntity.SortField.Period_ASC); wxBillRent.updateTenantInfo(tenantEntity); return wxBillPropertyMapper.findList(wxBillRent); - //TODO 111111111111 + //TODO 1111111 } /** @@ -341,7 +341,15 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService if (wxPropertyContract == null) { return new ResultData(ErrorCode.PROPERTY_CONTRACT_IS_NOT_FOUND); } - record.setPrice(StringUtils.isNotBlank(record.getPrice()) ? record.getPrice() : "0"); + + if (wxPropertyContract.getCreateType().intValue() == EnumPropertyCreateType.BY_SHOP.getCode().intValue()) { + record.calcutePrice(wxPropertyContract.getRentArea()); + }else { + WxRentContract rentContract = wxRentContractService.getSimpleDeatil(wxPropertyContract.getRentContractId()); + record.calcutePrice(rentContract.getRentArea()); + } + + //record.setPrice(StringUtils.isNotBlank(record.getPrice()) ? record.getPrice() : "0"); record.setDeposit(StringUtils.isNotBlank(record.getDeposit()) ? record.getDeposit() : "0"); record.setUpdatetime(new Date());